Signed-off-by: Thomas Perrot <[email protected]>
---
recipes-kernel/linux/linux-yocto_4.1.bbappend | 8 ++++----
recipes-security/clamav/clamav_0.99.1.bb | 2 +-
recipes-security/sssd/sssd_1.13.3.bb | 2 +-
recipes-tpm/trousers/trousers_0.3.13.bb | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/recipes-kernel/linux/linux-yocto_4.1.bbappend
b/recipes-kernel/linux/linux-yocto_4.1.bbappend
index 1043d5c..dc90e31 100644
--- a/recipes-kernel/linux/linux-yocto_4.1.bbappend
+++ b/recipes-kernel/linux/linux-yocto_4.1.bbappend
@@ -2,8 +2,8 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-4.1:"
# Tomoyo kernel support
SRC_URI += "\
- ${@base_contains('DISTRO_FEATURES', 'tomoyo', '
file://ccs-tools-yocto.4.1.patch', '', d)} \
- ${@base_contains('DISTRO_FEATURES', 'tomoyo', '
file://ccs-tools-yocto_security.patch', '', d)} \
- ${@base_contains('DISTRO_FEATURES', 'tomoyo', ' file://tomoyo.cfg', '',
d)} \
- ${@base_contains('DISTRO_FEATURES', 'tomoyo', ' file://tomoyo.scc', '',
d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'tomoyo', '
file://ccs-tools-yocto.4.1.patch', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'tomoyo', '
file://ccs-tools-yocto_security.patch', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'tomoyo', ' file://tomoyo.cfg',
'', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'tomoyo', ' file://tomoyo.scc',
'', d)} \
"
diff --git a/recipes-security/clamav/clamav_0.99.1.bb
b/recipes-security/clamav/clamav_0.99.1.bb
index edccc78..461015f 100644
--- a/recipes-security/clamav/clamav_0.99.1.bb
+++ b/recipes-security/clamav/clamav_0.99.1.bb
@@ -30,7 +30,7 @@ GID = "clamav"
PACKAGECONFIG ?= "ncurses openssl bz2 zlib "
PACKAGECONFIG += " ${@bb.utils.contains("DISTRO_FEATURES", "ipv6", "ipv6", "",
d)}"
-PACKAGECONFIG += "${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd',
'', d)}"
+PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd',
'systemd', '', d)}"
PACKAGECONFIG[pcre] = "--with-pcre=${STAGING_LIBDIR}, --without-pcre, libpcre"
PACKAGECONFIG[xml] = "--with-xml=${STAGING_LIBDIR}/.., --with-xml=no, libxml2,"
PACKAGECONFIG[json] = "--with-libjson=${STAGING_LIBDIR}, --without-libjson,
json,"
diff --git a/recipes-security/sssd/sssd_1.13.3.bb
b/recipes-security/sssd/sssd_1.13.3.bb
index d538af3..fd4f2a2 100644
--- a/recipes-security/sssd/sssd_1.13.3.bb
+++ b/recipes-security/sssd/sssd_1.13.3.bb
@@ -24,7 +24,7 @@ CACHED_CONFIGUREVARS =
"ac_cv_member_struct_ldap_conncb_lc_arg=no \
"
PACKAGECONFIG ?="nss"
-PACKAGECONFIG += "${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux',
'', d)}"
+PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'selinux',
'selinux', '', d)}"
PACKAGECONFIG[ssh] = "--with-ssh, --with-ssh=no, "
PACKAGECONFIG[samba] = "--with-samba, --with-samba=no, samba"
diff --git a/recipes-tpm/trousers/trousers_0.3.13.bb
b/recipes-tpm/trousers/trousers_0.3.13.bb
index 7001788..e274972 100644
--- a/recipes-tpm/trousers/trousers_0.3.13.bb
+++ b/recipes-tpm/trousers/trousers_0.3.13.bb
@@ -17,7 +17,7 @@ SRC_URI[md5sum] = "ad508f97b406f6e48cd90e85d78e7ca8"
SRC_URI[sha256sum] =
"bb908e4a3c88a17b247a4fc8e0fff3419d8a13170fe7bdfbe0e2c5c082a276d3"
inherit autotools pkgconfig useradd update-rc.d
-inherit
${@base_contains('VIRTUAL-RUNTIME_init_manager','systemd','systemd','', d)}
+inherit
${@bb.utils.contains('VIRTUAL-RUNTIME_init_manager','systemd','systemd','', d)}
PACKAGECONFIG ?= "gmp "
PACKAGECONFIG[gmp] = "--with-gmp, --with-gmp=no, gmp"
@@ -33,7 +33,7 @@ do_install_append() {
install -d ${D}${sysconfdir}/udev/rules.d
install -m 0644 ${WORKDIR}/trousers-udev.rules
${D}${sysconfdir}/udev/rules.d/45-trousers.rules
- if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then
+ if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)};
then
install -d ${D}${systemd_unitdir}/system
install -m 0644 ${WORKDIR}/tcsd.service ${D}${systemd_unitdir}/system/
sed -i -e 's#@SBINDIR@#${sbindir}#g'
${D}${systemd_unitdir}/system/tcsd.service
--
2.1.4
--
_______________________________________________
yocto mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/yocto
