mirror of
https://git.yoctoproject.org/poky
synced 2026-05-31 12:49:46 +00:00
Globally replace 'base_contains' calls with 'bb.utils.contains'
The base_contains is kept as a compatibility method and we ought to not use it in OE-Core so we can remove it from base metadata in future. (From OE-Core rev: d83b16dbf0862be387f84228710cb165c6d2b03b) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
08a38a7865
commit
4c14b09498
@@ -29,7 +29,7 @@ VIRTUAL-RUNTIME_init_manager ?= "sysvinit"
|
||||
VIRTUAL-RUNTIME_initscripts ?= "initscripts"
|
||||
VIRTUAL-RUNTIME_keymaps ?= "keymaps"
|
||||
|
||||
SYSVINIT_SCRIPTS = "${@base_contains('MACHINE_FEATURES', 'rtc', 'busybox-hwclock', '', d)} \
|
||||
SYSVINIT_SCRIPTS = "${@bb.utils.contains('MACHINE_FEATURES', 'rtc', 'busybox-hwclock', '', d)} \
|
||||
modutils-initscripts \
|
||||
init-ifupdown \
|
||||
"
|
||||
@@ -38,8 +38,8 @@ RDEPENDS_${PN} = "\
|
||||
base-files \
|
||||
base-passwd \
|
||||
busybox \
|
||||
${@base_contains("DISTRO_FEATURES", "sysvinit", "${SYSVINIT_SCRIPTS}", "", d)} \
|
||||
${@base_contains("MACHINE_FEATURES", "keyboard", "${VIRTUAL-RUNTIME_keymaps}", "", d)} \
|
||||
${@bb.utils.contains("DISTRO_FEATURES", "sysvinit", "${SYSVINIT_SCRIPTS}", "", d)} \
|
||||
${@bb.utils.contains("MACHINE_FEATURES", "keyboard", "${VIRTUAL-RUNTIME_keymaps}", "", d)} \
|
||||
netbase \
|
||||
${VIRTUAL-RUNTIME_login_manager} \
|
||||
${VIRTUAL-RUNTIME_init_manager} \
|
||||
|
||||
Reference in New Issue
Block a user