From a3617f24641962e6732c8369ce9256ae4be5a2a0 Mon Sep 17 00:00:00 2001 From: Derek Straka Date: Sun, 1 May 2016 10:27:45 -0400 Subject: globally replace 'base_contains' calls with 'bb.utils.contains' The 'base_contains' is now deprecated and only kept as a compatibility method. It will be removed in future releases. Signed-off-by: Derek Straka Signed-off-by: Bruce Ashfield --- recipes-containers/lxc/lxc_2.0.0.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'recipes-containers/lxc') diff --git a/recipes-containers/lxc/lxc_2.0.0.bb b/recipes-containers/lxc/lxc_2.0.0.bb index 34aab38a..9f01edde 100644 --- a/recipes-containers/lxc/lxc_2.0.0.bb +++ b/recipes-containers/lxc/lxc_2.0.0.bb @@ -38,7 +38,7 @@ S = "${WORKDIR}/${BPN}-${PV}" # Let's not configure for the host distro. # -PTEST_CONF = "${@base_contains('DISTRO_FEATURES', 'ptest', '--enable-tests', '', d)}" +PTEST_CONF = "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', '--enable-tests', '', d)}" EXTRA_OECONF += "--with-distro=${DISTRO} ${PTEST_CONF}" EXTRA_OECONF += "--with-init-script=\ @@ -48,7 +48,7 @@ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" EXTRA_OECONF += "--enable-log-src-basename" PACKAGECONFIG ??= "templates \ - ${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \ " PACKAGECONFIG[doc] = "--enable-doc --enable-api-docs,--disable-doc --disable-api-docs,," PACKAGECONFIG[rpath] = "--enable-rpath,--disable-rpath,," @@ -109,7 +109,7 @@ do_install_append() { for i in `grep -l "#! */bin/bash" ${D}${datadir}/lxc/hooks/*`; do \ sed -e 's|#! */bin/bash|#!/bin/sh|' -i $i; done - if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then + if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/init.d install -m 755 config/init/sysvinit/lxc* ${D}${sysconfdir}/init.d fi -- cgit v1.2.3-54-g00ecf