From 3dc0db19e133b9d5bb4b841fb08c9ff3e370b7ed Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Tue, 28 May 2024 13:17:03 +0000 Subject: [PATCH] k3s: convert remaining WORKDIR references to UNPACKDIR While the WORKDIR references seem to work, they may not continue to work. We switch to using UNPACKDIR which is where the SRC_URI referenced elements / files will be placed by the fetcher. Signed-off-by: Bruce Ashfield --- recipes-containers/k3s/k3s_git.bb | 12 ++++++------ 1 file 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}" include src_uri.inc -CNI_NETWORKING_FILES ?= "${WORKDIR}/cni-containerd-net.conf" +CNI_NETWORKING_FILES ?= "${UNPACKDIR}/cni-containerd-net.conf" inherit go inherit goarch @@ -92,14 +92,14 @@ do_install() { # 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" - install -m 755 "${WORKDIR}/k3s-killall.sh" "${D}${BIN_PREFIX}/bin" + install -m 755 "${UNPACKDIR}/k3s-clean" "${D}${BIN_PREFIX}/bin" + install -m 755 "${UNPACKDIR}/k3s-killall.sh" "${D}${BIN_PREFIX}/bin" if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -D -m 0644 "${WORKDIR}/k3s.service" "${D}${systemd_system_unitdir}/k3s.service" - install -D -m 0644 "${WORKDIR}/k3s-agent.service" "${D}${systemd_system_unitdir}/k3s-agent.service" + install -D -m 0644 "${UNPACKDIR}/k3s.service" "${D}${systemd_system_unitdir}/k3s.service" + install -D -m 0644 "${UNPACKDIR}/k3s-agent.service" "${D}${systemd_system_unitdir}/k3s-agent.service" 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" - install -m 755 "${WORKDIR}/k3s-agent" "${D}${BIN_PREFIX}/bin" + install -m 755 "${UNPACKDIR}/k3s-agent" "${D}${BIN_PREFIX}/bin" fi mkdir -p ${D}${datadir}/k3s/