From 884c0bbbc07c64dec219adef94010dc7ba18fd9a Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 14 Aug 2023 13:21:39 +0200 Subject: kubernetes: fix installed-vs-shipped with usrmerge * fixes: ERROR: kubernetes-1_v1.27.1+git2555e0f90e80a13628f47eca5cde34decc89babb-r0 do_package: QA Issue: kubernetes: Files/directories were installed but not shipped in any package: /bin /bin/k8s-init Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install. kubernetes: 2 installed and not shipped files. [installed-vs-shipped] Signed-off-by: Martin Jansa Signed-off-by: Bruce Ashfield --- recipes-containers/kubernetes/kubernetes_git.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'recipes-containers') diff --git a/recipes-containers/kubernetes/kubernetes_git.bb b/recipes-containers/kubernetes/kubernetes_git.bb index fefb2c13..e6c7aed7 100644 --- a/recipes-containers/kubernetes/kubernetes_git.bb +++ b/recipes-containers/kubernetes/kubernetes_git.bb @@ -104,8 +104,8 @@ do_install() { install -m 0644 ${WORKDIR}/git/release/cmd/kubepkg/templates/latest/deb/kubeadm/10-kubeadm.conf ${D}${systemd_unitdir}/system/kubelet.service.d/ if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -d "${D}${BIN_PREFIX}/bin" - install -m 755 "${WORKDIR}/k8s-init" "${D}${BIN_PREFIX}/bin" + install -d "${D}${BIN_PREFIX}${base_bindir}" + install -m 755 "${WORKDIR}/k8s-init" "${D}${BIN_PREFIX}${base_bindir}" install -d ${D}${sysconfdir}/sysctl.d install -m 0644 "${WORKDIR}/99-kubernetes.conf" "${D}${sysconfdir}/sysctl.d" @@ -143,7 +143,7 @@ FILES:kube-proxy = "${bindir}/kube-proxy" FILES:${PN}-misc = "${bindir} ${sysconfdir}/sysctl.d" ALLOW_EMPTY:${PN}-host = "1" -FILES:${PN}-host = "${BIN_PREFIX}/bin/k8s-init" +FILES:${PN}-host = "${BIN_PREFIX}${base_bindir}/k8s-init" RDEPENDS:${PN}-host = "${PN}" RRECOMMENDS:${PN} = "\ -- cgit v1.2.3-54-g00ecf