Globally replace 'base_contains' calls with 'bb.utils.contains'

Based on oe-core commit:

   commit 1528e596d4906c33e4be83fcf691cfe76d340ff3
   Author: Otavio Salvador <otavio@ossystems.com.br>
   Date:   Thu Apr 24 15:59:20 2014 -0300

   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: Joe MacDonald <joe_macdonald@mentor.com>

4 files changed, 7 insertions, 7 deletions

diff --git a/recipes-security/audit/audit_2.3.2.bb b/recipes-security/audit/audit_2.3.2.bb
index 4baf7a0..96b19c8 100644
--- a/recipes-security/audit/audit_2.3.2.bb
+++ b/recipes-security/audit/audit_2.3.2.bb
@@ -84,7 +84,7 @@ do_install_append() {
         install -D -m 0755 ${S}/../auditd ${D}/etc/init.d/auditd
         rm -rf ${D}/etc/rc.d
 
-        if ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
+        if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
                 install -d ${D}${sysconfdir}/tmpfiles.d/
                 install -m 0644 ${WORKDIR}/audit-volatile.conf ${D}${sysconfdir}/tmpfiles.d/
         fi
diff --git a/recipes-security/refpolicy/refpolicy-minimum_2.20130424.bb b/recipes-security/refpolicy/refpolicy-minimum_2.20130424.bb
index d9539f3..fc83fd5 100644
--- a/recipes-security/refpolicy/refpolicy-minimum_2.20130424.bb
+++ b/recipes-security/refpolicy/refpolicy-minimum_2.20130424.bb
@@ -40,7 +40,7 @@ prepare_policy_store () {
         mkdir -p ${D}${sysconfdir}/selinux/${POLICY_NAME}/modules/active/modules
         mkdir -p ${D}${sysconfdir}/selinux/${POLICY_NAME}/contexts/files
         touch ${D}${sysconfdir}/selinux/${POLICY_NAME}/contexts/files/file_contexts.local
-        if  ${@base_contains('DISTRO_FEATURES','compressed_policy','true','false',d)}; then
+        if  ${@bb.utils.contains('DISTRO_FEATURES','compressed_policy','true','false',d)}; then
                 bzip2 base.pp
                 cp base.pp.bz2 ${D}${sysconfdir}/selinux/${POLICY_NAME}/modules/active/base.pp
                 for i in ${POLICY_MODULES_MIN}; do
diff --git a/recipes-security/refpolicy/refpolicy_common.inc b/recipes-security/refpolicy/refpolicy_common.inc
index fd205cf..abadb2a 100644
--- a/recipes-security/refpolicy/refpolicy_common.inc
+++ b/recipes-security/refpolicy/refpolicy_common.inc
@@ -13,7 +13,7 @@ S = "${WORKDIR}/refpolicy"
 
 FILES_${PN} = " \
         ${sysconfdir}/selinux/${POLICY_NAME}/ \
-        ${@base_contains('DISTRO_FEATURES', 'compressed_policy', '${datadir}/selinux/${POLICY_NAME}/*.pp.bz2', '${datadir}/selinux/${POLICY_NAME}/*.pp', d)} \
+        ${@bb.utils.contains('DISTRO_FEATURES', 'compressed_policy', '${datadir}/selinux/${POLICY_NAME}/*.pp.bz2', '${datadir}/selinux/${POLICY_NAME}/*.pp', d)} \
         "
 FILES_${PN}-dev =+ "${datadir}/selinux/${POLICY_NAME}/include/"
 
@@ -69,7 +69,7 @@ prepare_policy_store () {
         mkdir -p ${D}${sysconfdir}/selinux/${POLICY_NAME}/modules/active/modules
         mkdir -p ${D}${sysconfdir}/selinux/${POLICY_NAME}/contexts/files
         touch ${D}${sysconfdir}/selinux/${POLICY_NAME}/contexts/files/file_contexts.local
-        if  ${@base_contains('DISTRO_FEATURES','compressed_policy','true','false',d)}; then
+        if  ${@bb.utils.contains('DISTRO_FEATURES','compressed_policy','true','false',d)}; then
                 for i in ${D}${datadir}/selinux/${POLICY_NAME}/*.pp; do
                         bzip2 $i
                         if [ "`basename $i`" != "base.pp" ]; then
diff --git a/recipes-security/selinux/policycoreutils.inc b/recipes-security/selinux/policycoreutils.inc
index a4d174c..153b688 100644
--- a/recipes-security/selinux/policycoreutils.inc
+++ b/recipes-security/selinux/policycoreutils.inc
@@ -7,7 +7,7 @@ context."
 SECTION = "base"
 LICENSE = "GPLv2+"
 
-SRC_URI += "${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}"
+SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}"
 
 PAM_SRC_URI = "file://pam.d/newrole \
                file://pam.d/run_init \
@@ -154,7 +154,7 @@ FILES_${PN}-loadpolicy += "\
 "
 FILES_${PN}-newrole += "\
         ${bindir}/newrole \
-        ${@base_contains('DISTRO_FEATURES', 'pam', '${sysconfdir}/pam.d/newrole', '', d)} \
+        ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${sysconfdir}/pam.d/newrole', '', d)} \
 "
 FILES_${PN}-python = "\
         ${libdir}/python${PYTHON_BASEVERSION}/site-packages/seobject.py* \
@@ -164,7 +164,7 @@ FILES_${PN}-python = "\
 FILES_${PN}-runinit += "\
         ${sbindir}/run_init \
         ${sbindir}/open_init_pty \
-        ${@base_contains('DISTRO_FEATURES', 'pam', '${sysconfdir}/pam.d/run_init', '', d)} \
+        ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${sysconfdir}/pam.d/run_init', '', d)} \
 "
 FILES_${PN}-dbg += "${libdir}/python${PYTHON_BASEVERSION}/site-packages/sepolicy/.debug/*"
 FILES_${PN}-sandbox += "\