diff options
author | Koen Kooi <koen@dominion.thruhere.net> | 2018-07-23 16:48:49 +0200 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2018-07-23 15:29:37 -0400 |
commit | 7cae5520fd3db229875f9a3af38e59d1ba2b4024 (patch) | |
tree | efa73f74a37abbb027087bfb165e334acb307f4f | |
parent | ba25e5c943db3830542ca36e531c8af7538fd69e (diff) | |
download | meta-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.bb | 3 |
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 | ||
17 | PACKAGES =+ "${PN}-misc" | ||
17 | PACKAGES =+ "kubeadm" | 18 | PACKAGES =+ "kubeadm" |
18 | PACKAGES =+ "kubectl" | 19 | PACKAGES =+ "kubectl" |
19 | PACKAGES =+ "kubelet" | 20 | PACKAGES =+ "kubelet" |
@@ -100,11 +101,13 @@ SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES','systemd','kubelet',' | |||
100 | SYSTEMD_SERVICE_kubelet = "${@bb.utils.contains('DISTRO_FEATURES','systemd','kubelet.service','',d)}" | 101 | SYSTEMD_SERVICE_kubelet = "${@bb.utils.contains('DISTRO_FEATURES','systemd','kubelet.service','',d)}" |
101 | SYSTEMD_AUTO_ENABLE_kubelet = "enable" | 102 | SYSTEMD_AUTO_ENABLE_kubelet = "enable" |
102 | 103 | ||
104 | FILES_${PN}-misc = "${bindir}" | ||
103 | FILES_kubeadm = "${bindir}/kubeadm ${systemd_unitdir}/system/kubelet.service.d/*" | 105 | FILES_kubeadm = "${bindir}/kubeadm ${systemd_unitdir}/system/kubelet.service.d/*" |
104 | FILES_kubectl = "${bindir}/kubectl" | 106 | FILES_kubectl = "${bindir}/kubectl" |
105 | FILES_kube-proxy = "${bindir}/kube-proxy" | 107 | FILES_kube-proxy = "${bindir}/kube-proxy" |
106 | FILES_kubelet = "${bindir}/kubelet ${systemd_unitdir}/system/kubelet.service ${sysconfdir}/kubernetes/manifests/" | 108 | FILES_kubelet = "${bindir}/kubelet ${systemd_unitdir}/system/kubelet.service ${sysconfdir}/kubernetes/manifests/" |
107 | 109 | ||
110 | |||
108 | INHIBIT_PACKAGE_STRIP = "1" | 111 | INHIBIT_PACKAGE_STRIP = "1" |
109 | INSANE_SKIP_${PN} += "ldflags already-stripped" | 112 | INSANE_SKIP_${PN} += "ldflags already-stripped" |
110 | 113 | ||