aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMirza Krak <mirza.krak@endian.se>2018-06-04 22:17:55 +0200
committergunnarx <gunnarx@users.noreply.github.com>2018-07-19 17:57:08 +0200
commitb414c071be4f690f4aa1ac2ef549af6d44d0bf9e (patch)
treeb5c13a33d4399c08731a81a4afe1b7377deb14c6
parentd4acd63de0ac64cc76cc67cb85c2ba718876a8c1 (diff)
downloadmeta-ivi-b414c071be4f690f4aa1ac2ef549af6d44d0bf9e.tar.gz
meta-ivi-b414c071be4f690f4aa1ac2ef549af6d44d0bf9e.tar.bz2
meta-ivi-b414c071be4f690f4aa1ac2ef549af6d44d0bf9e.zip
remove default-providers-ivi
Simply because there is nothing to put in it beside systemd defaults and this might as well reside in the main distribution file as it is quite thin now. Signed-off-by: Mirza Krak <mirza.krak@endian.se>
-rw-r--r--meta-ivi/conf/distro/include/default-providers-ivi.inc5
-rw-r--r--meta-ivi/conf/distro/poky-ivi-systemd.conf2
2 files changed, 2 insertions, 5 deletions
diff --git a/meta-ivi/conf/distro/include/default-providers-ivi.inc b/meta-ivi/conf/distro/include/default-providers-ivi.inc
deleted file mode 100644
index b4b1061..0000000
--- a/meta-ivi/conf/distro/include/default-providers-ivi.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Default virtual providers
-#
-PREFERRED_PROVIDER_udev ?= "systemd"
-PREFERRED_PROVIDER_udev-utils ?= "systemd"
diff --git a/meta-ivi/conf/distro/poky-ivi-systemd.conf b/meta-ivi/conf/distro/poky-ivi-systemd.conf
index 670d41b..4cdd6ef 100644
--- a/meta-ivi/conf/distro/poky-ivi-systemd.conf
+++ b/meta-ivi/conf/distro/poky-ivi-systemd.conf
@@ -21,6 +21,8 @@ include conf/distro/include/default-providers-ivi.inc
# on-top of x11 but that is not a use-case that we support
DISTRO_FEATURES_remove = "x11 directfb"
+PREFERRED_PROVIDER_udev ?= "systemd"
+PREFERRED_PROVIDER_udev-utils ?= "systemd"
VIRTUAL-RUNTIME_init_manager = "systemd"
VIRTUAL-RUNTIME_initscripts = ""