[yocto] [meta-virtualization][PATCH] Use bb.utils.contains instead of base_contains because it is deprecated

Bruce Ashfield bruce.ashfield at windriver.com
Wed May 25 05:56:18 PDT 2016


On 2016-05-25 4:27 AM, Thomas Perrot wrote:
> Signed-off-by: Thomas Perrot <thomas.perrot at tupi.fr>

I already had a change queued here for this, that I managed to
forget to push.

I'll rebase and do that now.

Cheers,

Bruce

> ---
>  recipes-containers/containerd/containerd_git.bb | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/recipes-containers/containerd/containerd_git.bb b/recipes-containers/containerd/containerd_git.bb
> index 46b9dc1..1a2c445 100644
> --- a/recipes-containers/containerd/containerd_git.bb
> +++ b/recipes-containers/containerd/containerd_git.bb
> @@ -59,8 +59,8 @@ do_compile() {
>
>  # Note: disabled for now, since docker is launching containerd
>  # inherit systemd
> -# SYSTEMD_PACKAGES = "${@base_contains('DISTRO_FEATURES','systemd','${PN}','',d)}"
> -# SYSTEMD_SERVICE_${PN} = "${@base_contains('DISTRO_FEATURES','systemd','containerd.service','',d)}"
> +# SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${PN}','',d)}"
> +# SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('DISTRO_FEATURES','systemd','containerd.service','',d)}"
>
>  do_install() {
>  	mkdir -p ${D}/${bindir}
> @@ -73,7 +73,7 @@ do_install() {
>  	ln -sf containerd-shim ${D}/${bindir}/docker-containerd-shim
>  	ln -sf containerd-ctr ${D}/${bindir}/docker-containerd-ctr
>
> -	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 644 ${S}/hack/containerd.service ${D}/${systemd_unitdir}/system
>  	        # adjust from /usr/local/bin to /usr/bin/
>




More information about the yocto mailing list