summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-03-20 17:00:06 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-26 22:43:04 +0000
commitf2165d28c341ee0c581f7178a8d70ddcd1317349 (patch)
tree273299aed22a9522db280309928b393c972eea97 /meta/recipes-core
parentdd65d845c8caef1825106dcc2a48a27d3f58358d (diff)
downloadpoky-f2165d28c341ee0c581f7178a8d70ddcd1317349.tar.gz
packagegroup-core-boot: revert to specifying sysvinit as default init manager
Don't follow DISTRO_FEATURES_INITMAN as that makes the packagegroups rebuild if you switch init manager. As in hybrid situations there's generally a clear primary and minimal init manager choice, so change VIRTUAL-RUNTIME_init_manager to set the primary init manager, and roll your own groups/images for the secondary. (From OE-Core rev: 7480814753bacbb6363125fce0738a93a602bcc9) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-core-boot.bb5
1 files changed, 2 insertions, 3 deletions
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
index b9183a8709..9306a34840 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
@@ -26,8 +26,8 @@ RCONFLICTS_${PN} = "task-core-boot"
26# Distro can override the following VIRTUAL-RUNTIME providers: 26# Distro can override the following VIRTUAL-RUNTIME providers:
27VIRTUAL-RUNTIME_dev_manager ?= "udev" 27VIRTUAL-RUNTIME_dev_manager ?= "udev"
28VIRTUAL-RUNTIME_login_manager ?= "tinylogin" 28VIRTUAL-RUNTIME_login_manager ?= "tinylogin"
29VIRTUAL-RUNTIME_init_manager ?= "${DISTRO_FEATURES_INITMAN}" 29VIRTUAL-RUNTIME_init_manager ?= "sysvinit"
30VIRTUAL-RUNTIME_initscripts ?= "${@base_contains('DISTRO_FEATURES', 'sysvinit', 'initscripts', '',d)}" 30VIRTUAL-RUNTIME_initscripts ?= "initscripts"
31VIRTUAL-RUNTIME_keymaps ?= "keymaps" 31VIRTUAL-RUNTIME_keymaps ?= "keymaps"
32 32
33RDEPENDS_${PN} = "\ 33RDEPENDS_${PN} = "\
@@ -42,7 +42,6 @@ RDEPENDS_${PN} = "\
42 ${VIRTUAL-RUNTIME_login_manager} \ 42 ${VIRTUAL-RUNTIME_login_manager} \
43 ${VIRTUAL-RUNTIME_init_manager} \ 43 ${VIRTUAL-RUNTIME_init_manager} \
44 ${VIRTUAL-RUNTIME_initscripts} \ 44 ${VIRTUAL-RUNTIME_initscripts} \
45 ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd-compat-units', '',d)} \
46 ${VIRTUAL-RUNTIME_dev_manager} \ 45 ${VIRTUAL-RUNTIME_dev_manager} \
47 ${VIRTUAL-RUNTIME_update-alternatives} \ 46 ${VIRTUAL-RUNTIME_update-alternatives} \
48 ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}" 47 ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}"