From 2aa6da625d493f92000a8f786496d19823a01a28 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Tue, 28 May 2024 13:17:03 +0000 Subject: [PATCH] kubernetes: 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. The remaining WORDIR references are to a secondary git repository with artifacts and should be safe. Signed-off-by: Bruce Ashfield --- recipes-containers/kubernetes/kubernetes_git.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-containers/kubernetes/kubernetes_git.bb b/recipes-containers/kubernetes/kubernetes_git.bb index 044175eb..a742486c 100644 --- a/recipes-containers/kubernetes/kubernetes_git.bb +++ b/recipes-containers/kubernetes/kubernetes_git.bb @@ -112,14 +112,14 @@ do_install() { if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then install -d "${D}${BIN_PREFIX}${base_bindir}" - install -m 755 "${WORKDIR}/k8s-init" "${D}${BIN_PREFIX}${base_bindir}" + install -m 755 "${UNPACKDIR}/k8s-init" "${D}${BIN_PREFIX}${base_bindir}" install -d ${D}${sysconfdir}/sysctl.d - install -m 0644 "${WORKDIR}/99-kubernetes.conf" "${D}${sysconfdir}/sysctl.d" + install -m 0644 "${UNPACKDIR}/99-kubernetes.conf" "${D}${sysconfdir}/sysctl.d" fi } -CNI_NETWORKING_FILES ?= "${WORKDIR}/cni-containerd-net.conflist" +CNI_NETWORKING_FILES ?= "${UNPACKDIR}/cni-containerd-net.conflist" PACKAGES =+ "kubeadm kubectl kubelet kube-proxy ${PN}-misc ${PN}-host"