From d891808b4585543b722cf4ddabb0321a040386e9 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Mon, 15 Mar 2021 23:11:30 -0400 Subject: k3s: drop ctr symlink We build and depend on our own containerd, we don't need the ctr symlink to k3s for proper operation. Signed-off-by: Bruce Ashfield --- recipes-containers/k3s/k3s_git.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipes-containers/k3s/k3s_git.bb b/recipes-containers/k3s/k3s_git.bb index 28d6ce0c..dc7397dc 100644 --- a/recipes-containers/k3s/k3s_git.bb +++ b/recipes-containers/k3s/k3s_git.bb @@ -51,10 +51,13 @@ do_compile() { upx -9 ./dist/artifacts/k3s fi } + 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" + # We want to use the containerd provided ctr + # 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" -- cgit v1.2.3-54-g00ecf