From 16a31ef4a84d46dd358e899fa8c0dd9e2703ecbb Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Wed, 25 May 2016 09:36:49 -0400 Subject: containerd: replace deprecated base_contains Signed-off-by: Bruce Ashfield --- 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 46b9dc1c..1a2c4454 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/ -- cgit v1.2.3-54-g00ecf