packagegroup-core-boot: correct runtime dependencies for non-sysvinit system

PATCH New Saul Wold 1 participant 1 message Aug 4, 2013

lore

Share & tools

lore

Saul Wold

author

2013-08-04 05:34 UTC #0 lore raw

PATCH v2 1/1 packagegroup-core-boot: correct runtime dependencies for non-sysvinit system

hwclock, ifup-down and modutils are all sysvinit scripts that are available in systemd also.

[YOCTO #4969]

Signed-off-by Saul Wold <[email protected]>

---
 meta/recipes-core/packagegroups/packagegroup-core-boot.bb | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

meta/recipes-core/packagegroups/packagegroup-core-boot.bb +6 -3

index d69c41d..486385a 100644
@@ -30,15 +30,18 @@ VIRTUAL-RUNTIME_init_manager ?= "sysvinit"
 VIRTUAL-RUNTIME_initscripts ?= "initscripts"
 VIRTUAL-RUNTIME_keymaps ?= "keymaps"
 
+SYSVINIT_SCRIPTS = "${@base_contains('MACHINE_FEATURES', 'rtc', 'busybox-hwclock', '', d)} \
+                    modutils-initscripts \
+                    init-ifupdown \
+                   "
+
 RDEPENDS_${PN} = "\
     base-files \
     base-passwd \
     busybox \
-    ${@base_contains("MACHINE_FEATURES", "rtc", "busybox-hwclock", "", d)} \
+    ${@base_contains("DISTRO_FEATURES", "sysvinit", "${SYSVINIT_SCRIPTS}", "", d)} \
     ${@base_contains("MACHINE_FEATURES", "keyboard", "${VIRTUAL-RUNTIME_keymaps}", "", d)} \
-    modutils-initscripts \
     netbase \
-    init-ifupdown \
     ${VIRTUAL-RUNTIME_login_manager} \
     ${VIRTUAL-RUNTIME_init_manager} \
     ${VIRTUAL-RUNTIME_initscripts} \

Signature · 1 line

1.8.1.4