summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--recipes-containers/k3s/k3s_git.bb12
1 files changed, 6 insertions, 6 deletions
diff --git a/recipes-containers/k3s/k3s_git.bb b/recipes-containers/k3s/k3s_git.bb
index 7d853a82..ab3f4366 100644
--- a/recipes-containers/k3s/k3s_git.bb
+++ b/recipes-containers/k3s/k3s_git.bb
@@ -23,7 +23,7 @@ PV = "v1.28.7+k3s1+git${SRCREV_k3s}"
23 23
24include src_uri.inc 24include src_uri.inc
25 25
26CNI_NETWORKING_FILES ?= "${WORKDIR}/cni-containerd-net.conf" 26CNI_NETWORKING_FILES ?= "${UNPACKDIR}/cni-containerd-net.conf"
27 27
28inherit go 28inherit go
29inherit goarch 29inherit goarch
@@ -92,14 +92,14 @@ do_install() {
92 # We want to use the containerd provided ctr 92 # We want to use the containerd provided ctr
93 # ln -sr "${D}/${BIN_PREFIX}/bin/k3s" "${D}${BIN_PREFIX}/bin/ctr" 93 # ln -sr "${D}/${BIN_PREFIX}/bin/k3s" "${D}${BIN_PREFIX}/bin/ctr"
94 ln -sr "${D}/${BIN_PREFIX}/bin/k3s" "${D}${BIN_PREFIX}/bin/kubectl" 94 ln -sr "${D}/${BIN_PREFIX}/bin/k3s" "${D}${BIN_PREFIX}/bin/kubectl"
95 install -m 755 "${WORKDIR}/k3s-clean" "${D}${BIN_PREFIX}/bin" 95 install -m 755 "${UNPACKDIR}/k3s-clean" "${D}${BIN_PREFIX}/bin"
96 install -m 755 "${WORKDIR}/k3s-killall.sh" "${D}${BIN_PREFIX}/bin" 96 install -m 755 "${UNPACKDIR}/k3s-killall.sh" "${D}${BIN_PREFIX}/bin"
97 97
98 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then 98 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
99 install -D -m 0644 "${WORKDIR}/k3s.service" "${D}${systemd_system_unitdir}/k3s.service" 99 install -D -m 0644 "${UNPACKDIR}/k3s.service" "${D}${systemd_system_unitdir}/k3s.service"
100 install -D -m 0644 "${WORKDIR}/k3s-agent.service" "${D}${systemd_system_unitdir}/k3s-agent.service" 100 install -D -m 0644 "${UNPACKDIR}/k3s-agent.service" "${D}${systemd_system_unitdir}/k3s-agent.service"
101 sed -i "s#\(Exec\)\(.*\)=\(.*\)\(k3s\)#\1\2=${BIN_PREFIX}/bin/\4#g" "${D}${systemd_system_unitdir}/k3s.service" "${D}${systemd_system_unitdir}/k3s-agent.service" 101 sed -i "s#\(Exec\)\(.*\)=\(.*\)\(k3s\)#\1\2=${BIN_PREFIX}/bin/\4#g" "${D}${systemd_system_unitdir}/k3s.service" "${D}${systemd_system_unitdir}/k3s-agent.service"
102 install -m 755 "${WORKDIR}/k3s-agent" "${D}${BIN_PREFIX}/bin" 102 install -m 755 "${UNPACKDIR}/k3s-agent" "${D}${BIN_PREFIX}/bin"
103 fi 103 fi
104 104
105 mkdir -p ${D}${datadir}/k3s/ 105 mkdir -p ${D}${datadir}/k3s/