- Install the binaries in the default "/usr/bin" and not in "/bin"
- The env BIN_PREFIX is there from the beginning but it is not defined, also fix a fatal QA errors installed-vs-shipped (only enabled with usrmerge): ERROR: kubernetes-1_v1.23.6+gitfbcfa33018159c033aee77b0d5456df6771aa9b5-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] ERROR: kubernetes-1_v1.23.6+gitfbcfa33018159c033aee77b0d5456df6771aa9b5-r0 do_package: Fatal QA errors were found, failing task. Signed-off-by: Jose Quaresma <[email protected]> --- v2: update commit description, drop k3s patch 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 e9460d4..82b75b1 100644 --- a/recipes-containers/kubernetes/kubernetes_git.bb +++ b/recipes-containers/kubernetes/kubernetes_git.bb @@ -103,8 +103,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}${bindir} + install -m 755 ${WORKDIR}/k8s-init ${D}${bindir} install -d ${D}${sysconfdir}/sysctl.d install -m 0644 "${WORKDIR}/99-kubernetes.conf" "${D}${sysconfdir}/sysctl.d" @@ -141,7 +141,7 @@ FILES:kube-proxy = "${bindir}/kube-proxy" FILES:${PN}-misc = "${bindir} ${sysconfdir}/sysctl.d" ALLOW_EMPTY:${PN}-host = "1" -FILE:${PN}-host = "${BIN_PREFIX}/bin/k8s-init" +FILE:${PN}-host = "${bindir}/k8s-init" RDEPENDS:${PN}-host = "${PN}" RRECOMMENDS:${PN} = "\ -- 2.37.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#7507): https://lists.yoctoproject.org/g/meta-virtualization/message/7507 Mute This Topic: https://lists.yoctoproject.org/mt/92918694/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
