summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/packagegroups
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2014-04-24 15:59:20 -0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-04-25 17:19:19 +0100
commit4c14b094985216c433d330fb3d9532d4b6c91fcf (patch)
tree6970f383436ca29450779bd98c378aae89f2e079 /meta/recipes-extended/packagegroups
parent08a38a7865c41ec60f4b993b964f8d477ea0f680 (diff)
downloadpoky-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-extended/packagegroups')
-rw-r--r--meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb2
-rw-r--r--meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb b/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb
index b87213cb99..ad3f240c04 100644
--- a/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb
+++ b/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb
@@ -133,7 +133,7 @@ RDEPENDS_packagegroup-core-full-cmdline-initscripts = "\
133RDEPENDS_packagegroup-core-full-cmdline-multiuser = "\ 133RDEPENDS_packagegroup-core-full-cmdline-multiuser = "\
134 cracklib \ 134 cracklib \
135 gzip \ 135 gzip \
136 ${@base_contains('DISTRO_FEATURES', 'pam', 'libuser', '', d)} \ 136 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libuser', '', d)} \
137 shadow \ 137 shadow \
138 sudo \ 138 sudo \
139 " 139 "
diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
index 914a7a9b7e..553befdb02 100644
--- a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
+++ b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
@@ -209,7 +209,7 @@ QT4PKGS = " \
209 libqtxml4 \ 209 libqtxml4 \
210 libqtnetwork4 \ 210 libqtnetwork4 \
211 qt4-plugin-sqldriver-sqlite \ 211 qt4-plugin-sqldriver-sqlite \
212 ${@base_contains("DISTRO_FEATURES", "opengl", "libqtopengl4", "", d)} \ 212 ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "libqtopengl4", "", d)} \
213 " 213 "
214QT4PKGS_mips64 = "" 214QT4PKGS_mips64 = ""
215 215