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>
This commit is contained in:
parent
dd65d845c8
commit
f2165d28c3
|
@ -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}"
|
||||
|
|
Loading…
Reference in New Issue