diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2020-10-25 21:37:30 -0400 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2021-03-15 23:15:42 -0400 |
commit | 96224a4accbbc15e4053eccd84cd198d5b7255eb (patch) | |
tree | e33f1e5d527f2eb03a27ac1d7f1be8049af04070 | |
parent | a876a2d487b2c29a650d6cf1acb5238a0be43548 (diff) | |
download | meta-virtualization-96224a4accbbc15e4053eccd84cd198d5b7255eb.tar.gz |
k3s: drop symlink to 'ctr'
containerd itself provides 'ctr', and it is in our rdepends. So on
target, we have a conflict for the provider of the ctr binary.
Dropping the ctr link from k3s, since having the actual containerd
package provide its binary .. makes sense.
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
-rw-r--r-- | recipes-containers/k3s/k3s_git.bb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/recipes-containers/k3s/k3s_git.bb b/recipes-containers/k3s/k3s_git.bb index cfc2c64c..f92521dd 100644 --- a/recipes-containers/k3s/k3s_git.bb +++ b/recipes-containers/k3s/k3s_git.bb | |||
@@ -44,7 +44,6 @@ do_install() { | |||
44 | install -d "${D}${BIN_PREFIX}/bin" | 44 | install -d "${D}${BIN_PREFIX}/bin" |
45 | install -m 755 "${S}/src/import/dist/artifacts/k3s" "${D}${BIN_PREFIX}/bin" | 45 | install -m 755 "${S}/src/import/dist/artifacts/k3s" "${D}${BIN_PREFIX}/bin" |
46 | ln -sr "${D}/${BIN_PREFIX}/bin/k3s" "${D}${BIN_PREFIX}/bin/crictl" | 46 | ln -sr "${D}/${BIN_PREFIX}/bin/k3s" "${D}${BIN_PREFIX}/bin/crictl" |
47 | ln -sr "${D}/${BIN_PREFIX}/bin/k3s" "${D}${BIN_PREFIX}/bin/ctr" | ||
48 | ln -sr "${D}/${BIN_PREFIX}/bin/k3s" "${D}${BIN_PREFIX}/bin/kubectl" | 47 | ln -sr "${D}/${BIN_PREFIX}/bin/k3s" "${D}${BIN_PREFIX}/bin/kubectl" |
49 | install -m 755 "${WORKDIR}/k3s-clean" "${D}${BIN_PREFIX}/bin" | 48 | install -m 755 "${WORKDIR}/k3s-clean" "${D}${BIN_PREFIX}/bin" |
50 | install -D -m 0644 "${WORKDIR}/cni-containerd-net.conf" "${D}/${sysconfdir}/cni/net.d/10-containerd-net.conf" | 49 | install -D -m 0644 "${WORKDIR}/cni-containerd-net.conf" "${D}/${sysconfdir}/cni/net.d/10-containerd-net.conf" |