From: akuster <akuster@mvista.com>
To: Thomas Perrot <thomas.perrot@tupi.fr>, yocto@yoctoproject.org
Subject: Re: [meta-security][PATCH] Use bb.utils.contains instead of base_contains because it is deprecated
Date: Wed, 25 May 2016 18:50:03 -0700 [thread overview]
Message-ID: <5746564B.3060303@mvista.com> (raw)
In-Reply-To: <1464164678-30438-1-git-send-email-thomas.perrot@tupi.fr>
On 05/25/2016 01:24 AM, Thomas Perrot wrote:
> Signed-off-by: Thomas Perrot <thomas.perrot@tupi.fr>
> ---
> recipes-kernel/linux/linux-yocto_4.1.bbappend | 8 ++++----
merged.
> 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 ++--
these last three are fixed in master-next. I just merged over master-next.
Thanks,
- armin
> 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
>
prev parent reply other threads:[~2016-05-26 1:50 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-25 8:24 [meta-security][PATCH] Use bb.utils.contains instead of base_contains because it is deprecated Thomas Perrot
2016-05-26 1:50 ` akuster [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5746564B.3060303@mvista.com \
--to=akuster@mvista.com \
--cc=thomas.perrot@tupi.fr \
--cc=yocto@yoctoproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.