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/docker/docker_git.bb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'recipes-containers/docker') diff --git a/recipes-containers/docker/docker_git.bb b/recipes-containers/docker/docker_git.bb index f232d3d8..81af82d0 100644 --- a/recipes-containers/docker/docker_git.bb +++ b/recipes-containers/docker/docker_git.bb @@ -100,18 +100,18 @@ do_compile() { inherit systemd update-rc.d -SYSTEMD_PACKAGES = "${@base_contains('DISTRO_FEATURES','systemd','${PN}','',d)}" -SYSTEMD_SERVICE_${PN} = "${@base_contains('DISTRO_FEATURES','systemd','docker.service','',d)}" +SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${PN}','',d)}" +SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('DISTRO_FEATURES','systemd','docker.service','',d)}" -INITSCRIPT_PACKAGES += "${@base_contains('DISTRO_FEATURES','sysvinit','${PN}','',d)}" -INITSCRIPT_NAME_${PN} = "${@base_contains('DISTRO_FEATURES','sysvinit','docker.init','',d)}" +INITSCRIPT_PACKAGES += "${@bb.utils.contains('DISTRO_FEATURES','sysvinit','${PN}','',d)}" +INITSCRIPT_NAME_${PN} = "${@bb.utils.contains('DISTRO_FEATURES','sysvinit','docker.init','',d)}" INITSCRIPT_PARAMS_${PN} = "${OS_DEFAULT_INITSCRIPT_PARAMS}" do_install() { mkdir -p ${D}/${bindir} cp ${S}/bundles/${DOCKER_VERSION}/dynbinary/docker-${DOCKER_VERSION} ${D}/${bindir}/docker - 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}/contrib/init/systemd/docker.* ${D}/${systemd_unitdir}/system # replaces one copied from above with one that uses the local registry for a mirror -- cgit v1.2.3-54-g00ecf