diff options
| author | Saul Wold <sgw@linux.intel.com> | 2013-08-01 18:40:07 -0700 |
|---|---|---|
| committer | Saul Wold <sgw@linux.intel.com> | 2013-08-05 23:59:56 -0700 |
| commit | ad6230c6e33cc76d735319d0f12ff6630655c288 (patch) | |
| tree | 8b4d5fca9680ab2c7c0ea58a719a9df80d4618e8 | |
| parent | 60f845774d62b76c09602df299cef922edfea3c4 (diff) | |
| download | openembedded-core-ad6230c6e33cc76d735319d0f12ff6630655c288.tar.gz openembedded-core-ad6230c6e33cc76d735319d0f12ff6630655c288.tar.bz2 openembedded-core-ad6230c6e33cc76d735319d0f12ff6630655c288.zip | |
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]
Signed-off-by: Saul Wold <sgw@linux.intel.com>
| -rw-r--r-- | meta/recipes-core/packagegroups/packagegroup-core-boot.bb | 9 |
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" 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} \ |