summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2013-08-01 18:40:07 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-08-06 12:39:56 +0100
commitbe13994d00ebb9973306fd2045dd142a859a2a62 (patch)
tree67e4edfb4495cec04f4b295d5c1b0a66330c4ac5 /meta
parent9e280a1d1e415a796aa600fad68d84b817864a3a (diff)
downloadpoky-be13994d00ebb9973306fd2045dd142a859a2a62.tar.gz
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 <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-core-boot.bb9
1 files 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"
30VIRTUAL-RUNTIME_initscripts ?= "initscripts" 30VIRTUAL-RUNTIME_initscripts ?= "initscripts"
31VIRTUAL-RUNTIME_keymaps ?= "keymaps" 31VIRTUAL-RUNTIME_keymaps ?= "keymaps"
32 32
33SYSVINIT_SCRIPTS = "${@base_contains('MACHINE_FEATURES', 'rtc', 'busybox-hwclock', '', d)} \
34 modutils-initscripts \
35 init-ifupdown \
36 "
37
33RDEPENDS_${PN} = "\ 38RDEPENDS_${PN} = "\
34 base-files \ 39 base-files \
35 base-passwd \ 40 base-passwd \
36 busybox \ 41 busybox \
37 ${@base_contains("MACHINE_FEATURES", "rtc", "busybox-hwclock", "", d)} \ 42 ${@base_contains("DISTRO_FEATURES", "sysvinit", "${SYSVINIT_SCRIPTS}", "", d)} \
38 ${@base_contains("MACHINE_FEATURES", "keyboard", "${VIRTUAL-RUNTIME_keymaps}", "", d)} \ 43 ${@base_contains("MACHINE_FEATURES", "keyboard", "${VIRTUAL-RUNTIME_keymaps}", "", d)} \
39 modutils-initscripts \
40 netbase \ 44 netbase \
41 init-ifupdown \
42 ${VIRTUAL-RUNTIME_login_manager} \ 45 ${VIRTUAL-RUNTIME_login_manager} \
43 ${VIRTUAL-RUNTIME_init_manager} \ 46 ${VIRTUAL-RUNTIME_init_manager} \
44 ${VIRTUAL-RUNTIME_initscripts} \ 47 ${VIRTUAL-RUNTIME_initscripts} \