From f2165d28c341ee0c581f7178a8d70ddcd1317349 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 20 Mar 2013 17:00:06 +0000 Subject: 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 Signed-off-by: Richard Purdie --- meta/recipes-core/packagegroups/packagegroup-core-boot.bb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'meta/recipes-core/packagegroups/packagegroup-core-boot.bb') 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" # Distro can override the following VIRTUAL-RUNTIME providers: VIRTUAL-RUNTIME_dev_manager ?= "udev" VIRTUAL-RUNTIME_login_manager ?= "tinylogin" -VIRTUAL-RUNTIME_init_manager ?= "${DISTRO_FEATURES_INITMAN}" -VIRTUAL-RUNTIME_initscripts ?= "${@base_contains('DISTRO_FEATURES', 'sysvinit', 'initscripts', '',d)}" +VIRTUAL-RUNTIME_init_manager ?= "sysvinit" +VIRTUAL-RUNTIME_initscripts ?= "initscripts" VIRTUAL-RUNTIME_keymaps ?= "keymaps" RDEPENDS_${PN} = "\ @@ -42,7 +42,6 @@ RDEPENDS_${PN} = "\ ${VIRTUAL-RUNTIME_login_manager} \ ${VIRTUAL-RUNTIME_init_manager} \ ${VIRTUAL-RUNTIME_initscripts} \ - ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd-compat-units', '',d)} \ ${VIRTUAL-RUNTIME_dev_manager} \ ${VIRTUAL-RUNTIME_update-alternatives} \ ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}" -- cgit v1.2.3-54-g00ecf