From be13994d00ebb9973306fd2045dd142a859a2a62 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Thu, 1 Aug 2013 18:40:07 -0700 Subject: [PATCH] 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] (From OE-Core rev: ad6230c6e33cc76d735319d0f12ff6630655c288) Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../recipes-core/packagegroups/packagegroup-core-boot.bb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb index d69c41ddff..486385aa70 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb @@ -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} \