aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/packagegroups
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:46:04 +0000
commit9e7c64ca9afbf27edd0d35a1830ce55ee6d778ab (patch)
tree07e43e27b0a847768d1aaa6f78fd7c406234fc19 /meta/recipes-core/packagegroups
parent77bbb839ba25b974a538b90d346b454ccd5deefd (diff)
downloadopenembedded-core-contrib-9e7c64ca9afbf27edd0d35a1830ce55ee6d778ab.tar.gz
openembedded-core-contrib-9e7c64ca9afbf27edd0d35a1830ce55ee6d778ab.tar.bz2
openembedded-core-contrib-9e7c64ca9afbf27edd0d35a1830ce55ee6d778ab.zip
packagegroup-core-boot: only install initscripts if we're using sysvinit
Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/packagegroups')
-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 fbc50c72192..edb9e7452db 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"
VIRTUAL-RUNTIME_dev_manager ?= "udev"
VIRTUAL-RUNTIME_login_manager ?= "tinylogin"
VIRTUAL-RUNTIME_init_manager ?= "${DISTRO_FEATURES_INITMAN}"
-VIRTUAL-RUNTIME_initscripts ?= "initscripts"
+VIRTUAL-RUNTIME_initscripts ?= "${@base_contains('DISTRO_FEATURES', 'sysvinit', 'initscripts', '',d)}"
VIRTUAL-RUNTIME_keymaps ?= "keymaps"
RDEPENDS_${PN} = "\
@@ -35,12 +35,12 @@ RDEPENDS_${PN} = "\
base-passwd \
busybox \
${@base_contains("MACHINE_FEATURES", "rtc", "busybox-hwclock", "", d)} \
- ${VIRTUAL-RUNTIME_initscripts} \
${@base_contains("MACHINE_FEATURES", "keyboard", "${VIRTUAL-RUNTIME_keymaps}", "", d)} \
modutils-initscripts \
netbase \
${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} \