From d83b16dbf0862be387f84228710cb165c6d2b03b Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Thu, 24 Apr 2014 15:59:20 -0300 Subject: 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. Signed-off-by: Otavio Salvador Signed-off-by: Richard Purdie --- meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb | 2 +- meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'meta/recipes-extended/packagegroups') 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 = "\ RDEPENDS_packagegroup-core-full-cmdline-multiuser = "\ cracklib \ gzip \ - ${@base_contains('DISTRO_FEATURES', 'pam', 'libuser', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libuser', '', d)} \ shadow \ sudo \ " 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 = " \ libqtxml4 \ libqtnetwork4 \ qt4-plugin-sqldriver-sqlite \ - ${@base_contains("DISTRO_FEATURES", "opengl", "libqtopengl4", "", d)} \ + ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "libqtopengl4", "", d)} \ " QT4PKGS_mips64 = "" -- cgit v1.2.3