summaryrefslogtreecommitdiffstats
path: root/recipes-containers/kubernetes
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2021-07-28 14:22:43 -0400
committerBruce Ashfield <bruce.ashfield@gmail.com>2021-08-02 17:17:53 -0400
commitd876cfc5bfafa516dee55d04b50b319a22165640 (patch)
treeea03c34f999bd85e440c85fc8e722df8666e2e68 /recipes-containers/kubernetes
parent5fdf66c1e2ec0c6b08573bf0a6aa9f84d2fc4ae6 (diff)
downloadmeta-virtualization-d876cfc5bfafa516dee55d04b50b319a22165640.tar.gz
global: overrides syntax conversion
OEcore/bitbake are moving to use the clearer ":" as an overrides separator. This is pass one of updating the meta-virt recipes to use that syntax. This has only been minimally build/runtime tested, more changes will be required for missed overrides, or incorrect conversions Note: A recent bitbake is required: commit 75fad23fc06c008a03414a1fc288a8614c6af9ca Author: Richard Purdie <richard.purdie@linuxfoundation.org> Date: Sun Jul 18 12:59:15 2021 +0100 bitbake: data_smart/parse: Allow ':' characters in variable/function names It is becomming increasingly clear we need to find a way to show what is/is not an override in our syntax. We need to do this in a way which is clear to users, readable and in a way we can transition to. The most effective way I've found to this is to use the ":" charater to directly replace "_" where an override is being specified. This includes "append", "prepend" and "remove" which are effectively special override directives. This patch simply adds the character to the parser so bitbake accepts the value but maps it back to "_" internally so there is no behaviour change. This change is simple enough it could potentially be backported to older version of bitbake meaning layers using the new syntax/markup could work with older releases. Even if other no other changes are accepted at this time and we don't backport, it does set us on a path where at some point in future we could require a more explict syntax. I've tested this patch by converting oe-core/meta-yocto to the new syntax for overrides (9000+ changes) and then seeing that builds continue to work with this patch. (Bitbake rev: 0dbbb4547cb2570d2ce607e9a53459df3c0ac284) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat (limited to 'recipes-containers/kubernetes')
-rw-r--r--recipes-containers/kubernetes/kubernetes_git.bb26
1 files changed, 13 insertions, 13 deletions
diff --git a/recipes-containers/kubernetes/kubernetes_git.bb b/recipes-containers/kubernetes/kubernetes_git.bb
index 6a8fd088..c2889096 100644
--- a/recipes-containers/kubernetes/kubernetes_git.bb
+++ b/recipes-containers/kubernetes/kubernetes_git.bb
@@ -87,30 +87,30 @@ do_install() {
87 87
88PACKAGES =+ "kubeadm kubectl kubelet kube-proxy ${PN}-misc" 88PACKAGES =+ "kubeadm kubectl kubelet kube-proxy ${PN}-misc"
89 89
90ALLOW_EMPTY_${PN} = "1" 90ALLOW_EMPTY:${PN} = "1"
91INSANE_SKIP_${PN} += "ldflags already-stripped" 91INSANE_SKIP:${PN} += "ldflags already-stripped"
92INSANE_SKIP_${PN}-misc += "ldflags already-stripped" 92INSANE_SKIP:${PN}-misc += "ldflags already-stripped"
93 93
94# Note: we are explicitly *not* adding docker to the rdepends, since we allow 94# Note: we are explicitly *not* adding docker to the rdepends, since we allow
95# backends like cri-o to be used. 95# backends like cri-o to be used.
96RDEPENDS_${PN} += "kubeadm \ 96RDEPENDS:${PN} += "kubeadm \
97 kubectl \ 97 kubectl \
98 kubelet \ 98 kubelet \
99 cni" 99 cni"
100 100
101RDEPENDS_kubeadm = "kubelet kubectl" 101RDEPENDS:kubeadm = "kubelet kubectl"
102FILES_kubeadm = "${bindir}/kubeadm ${systemd_unitdir}/system/kubelet.service.d/*" 102FILES:kubeadm = "${bindir}/kubeadm ${systemd_unitdir}/system/kubelet.service.d/*"
103 103
104RDEPENDS_kubelet = "iptables socat util-linux ethtool iproute2 ebtables iproute2-tc" 104RDEPENDS:kubelet = "iptables socat util-linux ethtool iproute2 ebtables iproute2-tc"
105FILES_kubelet = "${bindir}/kubelet ${systemd_unitdir}/system/kubelet.service ${sysconfdir}/kubernetes/manifests/" 105FILES:kubelet = "${bindir}/kubelet ${systemd_unitdir}/system/kubelet.service ${sysconfdir}/kubernetes/manifests/"
106 106
107SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES','systemd','kubelet','',d)}" 107SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES','systemd','kubelet','',d)}"
108SYSTEMD_SERVICE_kubelet = "${@bb.utils.contains('DISTRO_FEATURES','systemd','kubelet.service','',d)}" 108SYSTEMD_SERVICE:kubelet = "${@bb.utils.contains('DISTRO_FEATURES','systemd','kubelet.service','',d)}"
109SYSTEMD_AUTO_ENABLE_kubelet = "enable" 109SYSTEMD_AUTO_ENABLE:kubelet = "enable"
110 110
111FILES_kubectl = "${bindir}/kubectl" 111FILES:kubectl = "${bindir}/kubectl"
112FILES_kube-proxy = "${bindir}/kube-proxy" 112FILES:kube-proxy = "${bindir}/kube-proxy"
113FILES_${PN}-misc = "${bindir}" 113FILES:${PN}-misc = "${bindir}"
114 114
115 115
116deltask compile_ptest_base 116deltask compile_ptest_base