From 816dd5593c7756cc19b7443683b29a6662b795d3 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Tue, 12 Oct 2021 10:15:21 -0400 Subject: kubernetes: introduce devupstream variant Introduce a devupstream variant of k8s, so we can track development while also packaging the latest released versions. We set the SRECREV to 1.23.x as it was previously, and before the go version dependency bumps to above where OE core is currently providing. We move the patches to a :append, so they can apply to both the released and devupstream versions. Signed-off-by: Bruce Ashfield --- recipes-containers/kubernetes/kubernetes_git.bb | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/recipes-containers/kubernetes/kubernetes_git.bb b/recipes-containers/kubernetes/kubernetes_git.bb index 1627dc3b..1ca8ad66 100644 --- a/recipes-containers/kubernetes/kubernetes_git.bb +++ b/recipes-containers/kubernetes/kubernetes_git.bb @@ -10,8 +10,22 @@ SRCREV_kubernetes = "8b5a19147530eaac9476b0ab82980b4088bbc1b2" SRCREV_kubernetes-release = "7c1aa83dac555de6f05500911467b70aca4949f0" PE = "1" +BBCLASSEXTEND = "devupstream:target" +LIC_FILES_CHKSUM:class-devupstream = "file://src/import/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" +DEFAULT_PREFERENCE:class-devupstream = "-1" +SRC_URI:class-devupstream = "git://github.com/kubernetes/kubernetes.git;branch=master;name=kubernetes \ + git://github.com/kubernetes/release;branch=master;name=kubernetes-release;destsuffix=git/release \ + " +SRCREV_kubernetes:class-devupstream = "f6331c74b673d3039240edc77cd66696bbefdd9c" +SRCREV_kubernetes-release:class-devupstream = "7c1aa83dac555de6f05500911467b70aca4949f0" +PV:class-devupstream = "v1.23-alpha+git${SRCPV}" + +SRCREV_FORMAT ?= "kubernetes_git" + SRC_URI = "git://github.com/kubernetes/kubernetes.git;branch=release-1.22;name=kubernetes \ - git://github.com/kubernetes/release;branch=master;name=kubernetes-release;destsuffix=git/release \ + git://github.com/kubernetes/release;branch=master;name=kubernetes-release;destsuffix=git/release" + +SRC_URI:append = " \ file://0001-hack-lib-golang.sh-use-CC-from-environment.patch \ file://0001-cross-don-t-build-tests-by-default.patch \ file://0001-build-golang.sh-convert-remaining-go-calls-to-use.patch \ -- cgit v1.2.3-54-g00ecf