summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-01-19 22:47:12 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-20 12:58:56 +0000
commitc55926c1eabde7168e1779cfb2082cf52eaea87d (patch)
tree1b164acb958afcad91be1659232e245054748183 /meta/recipes-core
parent20dc0a5b9ba86fd56dc99a6dbf147cbb15cf33c3 (diff)
downloadpoky-c55926c1eabde7168e1779cfb2082cf52eaea87d.tar.gz
packagegroup-core-boot: only install initscripts if we're using sysvinit
(From OE-Core rev: 9e7c64ca9afbf27edd0d35a1830ce55ee6d778ab) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-core-boot.bb4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
index fbc50c7219..edb9e7452d 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
@@ -27,7 +27,7 @@ RCONFLICTS_${PN} = "task-core-boot"
27VIRTUAL-RUNTIME_dev_manager ?= "udev" 27VIRTUAL-RUNTIME_dev_manager ?= "udev"
28VIRTUAL-RUNTIME_login_manager ?= "tinylogin" 28VIRTUAL-RUNTIME_login_manager ?= "tinylogin"
29VIRTUAL-RUNTIME_init_manager ?= "${DISTRO_FEATURES_INITMAN}" 29VIRTUAL-RUNTIME_init_manager ?= "${DISTRO_FEATURES_INITMAN}"
30VIRTUAL-RUNTIME_initscripts ?= "initscripts" 30VIRTUAL-RUNTIME_initscripts ?= "${@base_contains('DISTRO_FEATURES', 'sysvinit', 'initscripts', '',d)}"
31VIRTUAL-RUNTIME_keymaps ?= "keymaps" 31VIRTUAL-RUNTIME_keymaps ?= "keymaps"
32 32
33RDEPENDS_${PN} = "\ 33RDEPENDS_${PN} = "\
@@ -35,12 +35,12 @@ RDEPENDS_${PN} = "\
35 base-passwd \ 35 base-passwd \
36 busybox \ 36 busybox \
37 ${@base_contains("MACHINE_FEATURES", "rtc", "busybox-hwclock", "", d)} \ 37 ${@base_contains("MACHINE_FEATURES", "rtc", "busybox-hwclock", "", d)} \
38 ${VIRTUAL-RUNTIME_initscripts} \
39 ${@base_contains("MACHINE_FEATURES", "keyboard", "${VIRTUAL-RUNTIME_keymaps}", "", d)} \ 38 ${@base_contains("MACHINE_FEATURES", "keyboard", "${VIRTUAL-RUNTIME_keymaps}", "", d)} \
40 modutils-initscripts \ 39 modutils-initscripts \
41 netbase \ 40 netbase \
42 ${VIRTUAL-RUNTIME_login_manager} \ 41 ${VIRTUAL-RUNTIME_login_manager} \
43 ${VIRTUAL-RUNTIME_init_manager} \ 42 ${VIRTUAL-RUNTIME_init_manager} \
43 ${VIRTUAL-RUNTIME_initscripts} \
44 ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd-compat-units', '',d)} \ 44 ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd-compat-units', '',d)} \
45 ${VIRTUAL-RUNTIME_dev_manager} \ 45 ${VIRTUAL-RUNTIME_dev_manager} \
46 ${VIRTUAL-RUNTIME_update-alternatives} \ 46 ${VIRTUAL-RUNTIME_update-alternatives} \