diff options
| author | Ross Burton <ross.burton@intel.com> | 2013-03-20 17:00:06 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-26 22:42:38 +0000 |
| commit | 7480814753bacbb6363125fce0738a93a602bcc9 (patch) | |
| tree | 1824d0bc547aa64b4e004f778eb564c8553cf386 /meta/recipes-core/packagegroups | |
| parent | d75dbfc34dcefb5b37b2e7e79a3d4e1a7903883d (diff) | |
| download | openembedded-core-7480814753bacbb6363125fce0738a93a602bcc9.tar.gz openembedded-core-7480814753bacbb6363125fce0738a93a602bcc9.tar.bz2 openembedded-core-7480814753bacbb6363125fce0738a93a602bcc9.zip | |
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.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-core/packagegroups')
| -rw-r--r-- | meta/recipes-core/packagegroups/packagegroup-core-boot.bb | 5 |
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" # 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}" |