Skip to contentSkip to conversation

sssd: Fix new QA warning

PATCH In review Armin Kuster 2 participants 4 messages May 7, 2016

lore
Share & tools
lore

Armin Kuster

author
#0 lore raw

PATCH 1/3 sssd: Fix new QA warning

NOTE:meta-security/recipes-security/sssd/sssd_1.13.3.bb: base_contains is deprecated, please use bb.utils.contains instead.

Signed-off-by Armin Kuster <[email protected]>
---
 recipes-security/sssd/sssd_1.13.3.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-security/sssd/sssd_1.13.3.bb +1 -1
index d538af3..fd4f2a2 100644
@@ -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"
Signature · 1 line
2.3.5
author
#1 lore raw

PATCH 2/3 trousers: Fix new QA warning

NOTE: meta-security/recipes-tpm/trousers/trousers_0.3.13.bb: base_contains is deprecated, please use bb.utils.contains instead.

Signed-off-by Armin Kuster <[email protected]>
---
 recipes-tpm/trousers/trousers_0.3.13.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
recipes-tpm/trousers/trousers_0.3.13.bb +2 -2
index 7001788..e274972 100644
@@ -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
Signature · 1 line
2.3.5
author
#2 lore raw

PATCH 3/3 clamav: Fix new QA warning

In reply to Armin Kuster

NOTE:meta-security/recipes-security/clamav/clamav_0.99.1.bb: base_contains is deprecated, please use bb.utils.contains instead.

Signed-off-by Armin Kuster <[email protected]>
---
 recipes-security/clamav/clamav_0.99.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-security/clamav/clamav_0.99.1.bb +1 -1
index edccc78..461015f 100644
@@ -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,"
Signature · 1 line
2.3.5
#3 lore raw

Re: [meta-security][PATCH 3/3] clamav: Fix new QA warning

On a related note, ClamAV 0.99.2 has been released.

On Sat, 2016-05-07 at 07:15 -0700, Armin Kuster wrote:

NOTE:meta-security/recipes-security/clamav/clamav_0.99.1.bb: base_contains is deprecated, please use bb.utils.contains instead.

Signed-off-by Armin Kuster <[email protected]<mailto:[email protected]>>
---
 recipes-security/clamav/clamav_0.99.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-security/clamav/clamav_0.99.1.bb +1 -1
index edccc78..461015f 100644
@@ -30,7 +30,7 @@ GID = "clamav"
 
 PACKAGECONFIG ?= "ncurses openssl bz2 zlib "
 PACKAGECONFIG += " ${@bb.utils.contains<mailto:${@bb.utils.contains>("DISTRO_FEATURES", "ipv6", "ipv6", "", d)}"
-PACKAGECONFIG += "${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
+PACKAGECONFIG += "${@bb.utils.contains<mailto:${@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,"

--
2.3.5