diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2014-04-24 15:59:20 -0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-04-25 17:19:19 +0100 |
commit | 4c14b094985216c433d330fb3d9532d4b6c91fcf (patch) | |
tree | 6970f383436ca29450779bd98c378aae89f2e079 /meta/recipes-core/packagegroups/packagegroup-core-boot.bb | |
parent | 08a38a7865c41ec60f4b993b964f8d477ea0f680 (diff) | |
download | poky-4c14b094985216c433d330fb3d9532d4b6c91fcf.tar.gz |
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>
Diffstat (limited to 'meta/recipes-core/packagegroups/packagegroup-core-boot.bb')
-rw-r--r-- | meta/recipes-core/packagegroups/packagegroup-core-boot.bb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb index 1154bc05b5..c8bc362242 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb | |||
@@ -29,7 +29,7 @@ VIRTUAL-RUNTIME_init_manager ?= "sysvinit" | |||
29 | VIRTUAL-RUNTIME_initscripts ?= "initscripts" | 29 | VIRTUAL-RUNTIME_initscripts ?= "initscripts" |
30 | VIRTUAL-RUNTIME_keymaps ?= "keymaps" | 30 | VIRTUAL-RUNTIME_keymaps ?= "keymaps" |
31 | 31 | ||
32 | SYSVINIT_SCRIPTS = "${@base_contains('MACHINE_FEATURES', 'rtc', 'busybox-hwclock', '', d)} \ | 32 | SYSVINIT_SCRIPTS = "${@bb.utils.contains('MACHINE_FEATURES', 'rtc', 'busybox-hwclock', '', d)} \ |
33 | modutils-initscripts \ | 33 | modutils-initscripts \ |
34 | init-ifupdown \ | 34 | init-ifupdown \ |
35 | " | 35 | " |
@@ -38,8 +38,8 @@ RDEPENDS_${PN} = "\ | |||
38 | base-files \ | 38 | base-files \ |
39 | base-passwd \ | 39 | base-passwd \ |
40 | busybox \ | 40 | busybox \ |
41 | ${@base_contains("DISTRO_FEATURES", "sysvinit", "${SYSVINIT_SCRIPTS}", "", d)} \ | 41 | ${@bb.utils.contains("DISTRO_FEATURES", "sysvinit", "${SYSVINIT_SCRIPTS}", "", d)} \ |
42 | ${@base_contains("MACHINE_FEATURES", "keyboard", "${VIRTUAL-RUNTIME_keymaps}", "", d)} \ | 42 | ${@bb.utils.contains("MACHINE_FEATURES", "keyboard", "${VIRTUAL-RUNTIME_keymaps}", "", d)} \ |
43 | netbase \ | 43 | netbase \ |
44 | ${VIRTUAL-RUNTIME_login_manager} \ | 44 | ${VIRTUAL-RUNTIME_login_manager} \ |
45 | ${VIRTUAL-RUNTIME_init_manager} \ | 45 | ${VIRTUAL-RUNTIME_init_manager} \ |