aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe MacDonald <joe_macdonald@mentor.com>2014-09-16 21:05:00 -0400
committerJoe MacDonald <joe_macdonald@mentor.com>2014-09-24 08:52:17 -0400
commite0a92ce7b2da899da8a2e2884eca9fd74aa12763 (patch)
tree44a262aad380a355d5e1fb76b46878eedbdf5599
parentaf4937c07eadb13d829c1ef278bed6528a2603a5 (diff)
downloadmeta-selinux-e0a92ce7b2da899da8a2e2884eca9fd74aa12763.tar.gz
meta-selinux-e0a92ce7b2da899da8a2e2884eca9fd74aa12763.tar.bz2
meta-selinux-e0a92ce7b2da899da8a2e2884eca9fd74aa12763.zip
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>
-rw-r--r--classes/selinux.bbclass2
-rw-r--r--recipes-extended/tar/tar_1.27.1.bbappend2
-rw-r--r--recipes-kernel/linux/linux-yocto_3.14.bbappend4
-rw-r--r--recipes-security/audit/audit_2.3.2.bb2
-rw-r--r--recipes-security/selinux/policycoreutils.inc6
5 files changed, 8 insertions, 8 deletions
diff --git a/classes/selinux.bbclass b/classes/selinux.bbclass
index f9db49c..fb0df27 100644
--- a/classes/selinux.bbclass
+++ b/classes/selinux.bbclass
@@ -1,5 +1,5 @@
def target_selinux(d, truevar = 'selinux', falsevar = ''):
- if not base_contains("DISTRO_FEATURES", "selinux", True, False, d):
+ if not bb.utils.contains("DISTRO_FEATURES", "selinux", True, False, d):
return falsevar
pn = d.getVar("PN", True)
diff --git a/recipes-extended/tar/tar_1.27.1.bbappend b/recipes-extended/tar/tar_1.27.1.bbappend
index 8e45037..a1dc99c 100644
--- a/recipes-extended/tar/tar_1.27.1.bbappend
+++ b/recipes-extended/tar/tar_1.27.1.bbappend
@@ -5,7 +5,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
inherit with-selinux
-PACKAGECONFIG += "${@base_contains('DISTRO_FEATURES', 'acl', 'acl', '', d)}"
+PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'acl', 'acl', '', d)}"
# configure has no acl enable/disable options!
#
diff --git a/recipes-kernel/linux/linux-yocto_3.14.bbappend b/recipes-kernel/linux/linux-yocto_3.14.bbappend
index 4118cc0..65c79ef 100644
--- a/recipes-kernel/linux/linux-yocto_3.14.bbappend
+++ b/recipes-kernel/linux/linux-yocto_3.14.bbappend
@@ -1,8 +1,8 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
# Enable selinux support in the kernel if the feature is enabled
-SRC_URI += "${@base_contains('DISTRO_FEATURES', 'selinux', 'file://selinux.cfg', '', d)}"
+SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'file://selinux.cfg', '', d)}"
# For inconsistent kallsyms data bug on ARM
# http://lists.infradead.org/pipermail/linux-arm-kernel/2012-March/thread.html#89718
-EXTRA_OEMAKE += "${@base_contains('TARGET_ARCH', 'arm', ' KALLSYMS_EXTRA_PASS=1', '', d)}"
+EXTRA_OEMAKE += "${@bb.utils.contains('TARGET_ARCH', 'arm', ' KALLSYMS_EXTRA_PASS=1', '', d)}"
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/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 += "\