summaryrefslogtreecommitdiffstats
path: root/recipes-containers
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2023-08-14 13:21:39 +0200
committerBruce Ashfield <bruce.ashfield@gmail.com>2023-08-15 18:47:55 +0000
commit884c0bbbc07c64dec219adef94010dc7ba18fd9a (patch)
treea8cd10e393845c9bcdfce41de6f2ab07fd746069 /recipes-containers
parent926d714972edc85f47ad771d0bfe9565d7e57e74 (diff)
downloadmeta-virtualization-884c0bbbc07c64dec219adef94010dc7ba18fd9a.tar.gz
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 <Martin.Jansa@gmail.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat (limited to 'recipes-containers')
-rw-r--r--recipes-containers/kubernetes/kubernetes_git.bb6
1 files changed, 3 insertions, 3 deletions
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() {
104 install -m 0644 ${WORKDIR}/git/release/cmd/kubepkg/templates/latest/deb/kubeadm/10-kubeadm.conf ${D}${systemd_unitdir}/system/kubelet.service.d/ 104 install -m 0644 ${WORKDIR}/git/release/cmd/kubepkg/templates/latest/deb/kubeadm/10-kubeadm.conf ${D}${systemd_unitdir}/system/kubelet.service.d/
105 105
106 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then 106 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
107 install -d "${D}${BIN_PREFIX}/bin" 107 install -d "${D}${BIN_PREFIX}${base_bindir}"
108 install -m 755 "${WORKDIR}/k8s-init" "${D}${BIN_PREFIX}/bin" 108 install -m 755 "${WORKDIR}/k8s-init" "${D}${BIN_PREFIX}${base_bindir}"
109 109
110 install -d ${D}${sysconfdir}/sysctl.d 110 install -d ${D}${sysconfdir}/sysctl.d
111 install -m 0644 "${WORKDIR}/99-kubernetes.conf" "${D}${sysconfdir}/sysctl.d" 111 install -m 0644 "${WORKDIR}/99-kubernetes.conf" "${D}${sysconfdir}/sysctl.d"
@@ -143,7 +143,7 @@ FILES:kube-proxy = "${bindir}/kube-proxy"
143FILES:${PN}-misc = "${bindir} ${sysconfdir}/sysctl.d" 143FILES:${PN}-misc = "${bindir} ${sysconfdir}/sysctl.d"
144 144
145ALLOW_EMPTY:${PN}-host = "1" 145ALLOW_EMPTY:${PN}-host = "1"
146FILES:${PN}-host = "${BIN_PREFIX}/bin/k8s-init" 146FILES:${PN}-host = "${BIN_PREFIX}${base_bindir}/k8s-init"
147RDEPENDS:${PN}-host = "${PN}" 147RDEPENDS:${PN}-host = "${PN}"
148 148
149RRECOMMENDS:${PN} = "\ 149RRECOMMENDS:${PN} = "\