diff options
author | Ross Burton <ross.burton@intel.com> | 2013-01-19 22:47:12 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-01-20 12:58:56 +0000 |
commit | c55926c1eabde7168e1779cfb2082cf52eaea87d (patch) | |
tree | 1b164acb958afcad91be1659232e245054748183 /meta/recipes-core/packagegroups/packagegroup-core-boot.bb | |
parent | 20dc0a5b9ba86fd56dc99a6dbf147cbb15cf33c3 (diff) | |
download | ast2050-yocto-poky-c55926c1eabde7168e1779cfb2082cf52eaea87d.zip ast2050-yocto-poky-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/packagegroups/packagegroup-core-boot.bb')
-rw-r--r-- | meta/recipes-core/packagegroups/packagegroup-core-boot.bb | 4 |
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 fbc50c7..edb9e74 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} \ |