From 96224a4accbbc15e4053eccd84cd198d5b7255eb Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Sun, 25 Oct 2020 21:37:30 -0400 Subject: 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 --- recipes-containers/k3s/k3s_git.bb | 1 - 1 file changed, 1 deletion(-) 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() { install -d "${D}${BIN_PREFIX}/bin" install -m 755 "${S}/src/import/dist/artifacts/k3s" "${D}${BIN_PREFIX}/bin" ln -sr "${D}/${BIN_PREFIX}/bin/k3s" "${D}${BIN_PREFIX}/bin/crictl" - ln -sr "${D}/${BIN_PREFIX}/bin/k3s" "${D}${BIN_PREFIX}/bin/ctr" ln -sr "${D}/${BIN_PREFIX}/bin/k3s" "${D}${BIN_PREFIX}/bin/kubectl" install -m 755 "${WORKDIR}/k3s-clean" "${D}${BIN_PREFIX}/bin" install -D -m 0644 "${WORKDIR}/cni-containerd-net.conf" "${D}/${sysconfdir}/cni/net.d/10-containerd-net.conf" -- cgit v1.2.3-54-g00ecf