diff options
| author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2016-05-25 09:36:49 -0400 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2016-05-25 09:36:49 -0400 |
| commit | 16a31ef4a84d46dd358e899fa8c0dd9e2703ecbb (patch) | |
| tree | 530e61e7746fb81d515e41d69cc0d39778b076c0 | |
| parent | 0afa6e168ea6421fdaeedb426c2131b7db1f9ed9 (diff) | |
| download | meta-virtualization-16a31ef4a84d46dd358e899fa8c0dd9e2703ecbb.tar.gz | |
containerd: replace deprecated base_contains
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
| -rw-r--r-- | recipes-containers/containerd/containerd_git.bb | 6 |
1 files 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() { | |||
| 59 | 59 | ||
| 60 | # Note: disabled for now, since docker is launching containerd | 60 | # Note: disabled for now, since docker is launching containerd |
| 61 | # inherit systemd | 61 | # inherit systemd |
| 62 | # SYSTEMD_PACKAGES = "${@base_contains('DISTRO_FEATURES','systemd','${PN}','',d)}" | 62 | # SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${PN}','',d)}" |
| 63 | # SYSTEMD_SERVICE_${PN} = "${@base_contains('DISTRO_FEATURES','systemd','containerd.service','',d)}" | 63 | # SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('DISTRO_FEATURES','systemd','containerd.service','',d)}" |
| 64 | 64 | ||
| 65 | do_install() { | 65 | do_install() { |
| 66 | mkdir -p ${D}/${bindir} | 66 | mkdir -p ${D}/${bindir} |
| @@ -73,7 +73,7 @@ do_install() { | |||
| 73 | ln -sf containerd-shim ${D}/${bindir}/docker-containerd-shim | 73 | ln -sf containerd-shim ${D}/${bindir}/docker-containerd-shim |
| 74 | ln -sf containerd-ctr ${D}/${bindir}/docker-containerd-ctr | 74 | ln -sf containerd-ctr ${D}/${bindir}/docker-containerd-ctr |
| 75 | 75 | ||
| 76 | if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then | 76 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then |
| 77 | install -d ${D}${systemd_unitdir}/system | 77 | install -d ${D}${systemd_unitdir}/system |
| 78 | install -m 644 ${S}/hack/containerd.service ${D}/${systemd_unitdir}/system | 78 | install -m 644 ${S}/hack/containerd.service ${D}/${systemd_unitdir}/system |
| 79 | # adjust from /usr/local/bin to /usr/bin/ | 79 | # adjust from /usr/local/bin to /usr/bin/ |
