summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2018-07-23 16:48:49 +0200
committerBruce Ashfield <bruce.ashfield@windriver.com>2018-07-23 15:29:37 -0400
commit7cae5520fd3db229875f9a3af38e59d1ba2b4024 (patch)
treeefa73f74a37abbb027087bfb165e334acb307f4f
parentba25e5c943db3830542ca36e531c8af7538fd69e (diff)
downloadmeta-virtualization-7cae5520fd3db229875f9a3af38e59d1ba2b4024.tar.gz
kubernetes: package remaining files into PN-misc
A previous commit changed do_installed to install everything, not just kube*, adjust PACKAGES to keep ${PN} empty as it was before. Signed-off-by: Koen Kooi <koen.kooi@linaro.org> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
-rw-r--r--recipes-containers/kubernetes/kubernetes_git.bb3
1 files changed, 3 insertions, 0 deletions
diff --git a/recipes-containers/kubernetes/kubernetes_git.bb b/recipes-containers/kubernetes/kubernetes_git.bb
index f23721c2..bb80c3f1 100644
--- a/recipes-containers/kubernetes/kubernetes_git.bb
+++ b/recipes-containers/kubernetes/kubernetes_git.bb
@@ -14,6 +14,7 @@ DEPENDS += "rsync-native \
14 coreutils-native \ 14 coreutils-native \
15 " 15 "
16 16
17PACKAGES =+ "${PN}-misc"
17PACKAGES =+ "kubeadm" 18PACKAGES =+ "kubeadm"
18PACKAGES =+ "kubectl" 19PACKAGES =+ "kubectl"
19PACKAGES =+ "kubelet" 20PACKAGES =+ "kubelet"
@@ -100,11 +101,13 @@ SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES','systemd','kubelet','
100SYSTEMD_SERVICE_kubelet = "${@bb.utils.contains('DISTRO_FEATURES','systemd','kubelet.service','',d)}" 101SYSTEMD_SERVICE_kubelet = "${@bb.utils.contains('DISTRO_FEATURES','systemd','kubelet.service','',d)}"
101SYSTEMD_AUTO_ENABLE_kubelet = "enable" 102SYSTEMD_AUTO_ENABLE_kubelet = "enable"
102 103
104FILES_${PN}-misc = "${bindir}"
103FILES_kubeadm = "${bindir}/kubeadm ${systemd_unitdir}/system/kubelet.service.d/*" 105FILES_kubeadm = "${bindir}/kubeadm ${systemd_unitdir}/system/kubelet.service.d/*"
104FILES_kubectl = "${bindir}/kubectl" 106FILES_kubectl = "${bindir}/kubectl"
105FILES_kube-proxy = "${bindir}/kube-proxy" 107FILES_kube-proxy = "${bindir}/kube-proxy"
106FILES_kubelet = "${bindir}/kubelet ${systemd_unitdir}/system/kubelet.service ${sysconfdir}/kubernetes/manifests/" 108FILES_kubelet = "${bindir}/kubelet ${systemd_unitdir}/system/kubelet.service ${sysconfdir}/kubernetes/manifests/"
107 109
110
108INHIBIT_PACKAGE_STRIP = "1" 111INHIBIT_PACKAGE_STRIP = "1"
109INSANE_SKIP_${PN} += "ldflags already-stripped" 112INSANE_SKIP_${PN} += "ldflags already-stripped"
110 113