aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2021-03-15 23:11:30 -0400
committerBruce Ashfield <bruce.ashfield@gmail.com>2021-03-16 09:30:48 -0400
commitd891808b4585543b722cf4ddabb0321a040386e9 (patch)
tree21fa18c79e3a3604de00434924a168a634321652
parentcad10c54f287a673623c148a9ab015b1f4071b5d (diff)
downloadmeta-virtualization-d891808b4585543b722cf4ddabb0321a040386e9.tar.gz
meta-virtualization-d891808b4585543b722cf4ddabb0321a040386e9.tar.bz2
meta-virtualization-d891808b4585543b722cf4ddabb0321a040386e9.zip
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 <bruce.ashfield@gmail.com>
-rw-r--r--recipes-containers/k3s/k3s_git.bb3
1 files changed, 3 insertions, 0 deletions
diff --git a/recipes-containers/k3s/k3s_git.bb b/recipes-containers/k3s/k3s_git.bb
index 28d6ce0..dc7397d 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"