diff options
| -rw-r--r-- | recipes-containers/containerd/containerd-opencontainers_git.bb | 3 | ||||
| -rw-r--r-- | recipes-containers/containerd/files/containerd.service | 11 |
2 files changed, 1 insertions, 13 deletions
diff --git a/recipes-containers/containerd/containerd-opencontainers_git.bb b/recipes-containers/containerd/containerd-opencontainers_git.bb index 0689fb5c..7382e107 100644 --- a/recipes-containers/containerd/containerd-opencontainers_git.bb +++ b/recipes-containers/containerd/containerd-opencontainers_git.bb | |||
| @@ -9,7 +9,6 @@ SRCREV = "33d90b72d1e44987118ac111d4f7a108d412099b" | |||
| 9 | SRC_URI = "git://github.com/containerd/containerd;branch=release/1.4 \ | 9 | SRC_URI = "git://github.com/containerd/containerd;branch=release/1.4 \ |
| 10 | file://0001-build-use-oe-provided-GO-and-flags.patch \ | 10 | file://0001-build-use-oe-provided-GO-and-flags.patch \ |
| 11 | file://0001-Add-build-option-GODEBUG-1.patch \ | 11 | file://0001-Add-build-option-GODEBUG-1.patch \ |
| 12 | file://containerd.service \ | ||
| 13 | " | 12 | " |
| 14 | 13 | ||
| 15 | # Apache-2.0 for containerd | 14 | # Apache-2.0 for containerd |
| @@ -105,7 +104,7 @@ do_install() { | |||
| 105 | 104 | ||
| 106 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then | 105 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then |
| 107 | install -d ${D}${systemd_unitdir}/system | 106 | install -d ${D}${systemd_unitdir}/system |
| 108 | install -m 644 ${WORKDIR}/containerd.service ${D}/${systemd_unitdir}/system | 107 | install -m 644 ${S}/src/import/containerd.service ${D}/${systemd_unitdir}/system |
| 109 | # adjust from /usr/local/bin to /usr/bin/ | 108 | # adjust from /usr/local/bin to /usr/bin/ |
| 110 | sed -e "s:/usr/local/bin/containerd:${bindir}/containerd:g" -i ${D}/${systemd_unitdir}/system/containerd.service | 109 | sed -e "s:/usr/local/bin/containerd:${bindir}/containerd:g" -i ${D}/${systemd_unitdir}/system/containerd.service |
| 111 | fi | 110 | fi |
diff --git a/recipes-containers/containerd/files/containerd.service b/recipes-containers/containerd/files/containerd.service deleted file mode 100644 index 23633b02..00000000 --- a/recipes-containers/containerd/files/containerd.service +++ /dev/null | |||
| @@ -1,11 +0,0 @@ | |||
| 1 | [Unit] | ||
| 2 | Description=containerd | ||
| 3 | Documentation=https://containerd.tools | ||
| 4 | After=network.target | ||
| 5 | |||
| 6 | [Service] | ||
| 7 | ExecStart=/usr/local/bin/containerd | ||
| 8 | Delegate=yes | ||
| 9 | |||
| 10 | [Install] | ||
| 11 | WantedBy=multi-user.target | ||
