MIRRORS/meta-virtualization
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-virtualization.git synced 2025-07-19 20:59:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

k8s: move to 1.21 release

Browse Source 
Updating kubernetes to the 1.21 release. Minor build changes and
patch refreshes were required.

The changelog is massive, so we won't list it here.

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
This commit is contained in:
Bruce Ashfield 2021-04-16 09:32:44 -04:00
parent 77f8a0b4d4
commit cd75395b16
3 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
recipes-containers/kubernetes/kubernetes/0001-Makefile.generated_files-Fix-race-issue-for-installi.patch
View File

@ -28,11 +28,11 @@ Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
src/import/build/root/Makefile.generated_files | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/import/build/root/Makefile.generated_files b/src/import/build/root/Makefile.generated_files
index c8cbf27..e3f1593 100644
--- a/src/import/build/root/Makefile.generated_files
+++ b/src/import/build/root/Makefile.generated_files
@@ -63,7 +63,9 @@ $(META_DIR)/$(GO_PKGDEPS_FILE): FORCE
Index: kubernetes-v1.21.1+git45da3fc33872083fb225c1a8c4d03e530d6f7630/src/import/build/root/Makefile.generated_files
===================================================================
--- kubernetes-v1.21.1+git45da3fc33872083fb225c1a8c4d03e530d6f7630.orig/src/import/build/root/Makefile.generated_files
+++ kubernetes-v1.21.1+git45da3fc33872083fb225c1a8c4d03e530d6f7630/src/import/build/root/Makefile.generated_files
@@ -67,7 +67,9 @@
if [[ "$(DBG_CODEGEN)" == 1 ]]; then \
echo "DBG: calculating Go dependencies"; \
fi
@ -40,9 +40,6 @@ index c8cbf27..e3f1593 100644
+ if [ ! -e _output/local/go/bin/go2make ]; then \
+ hack/run-in-gopath.sh go install ./hack/make-rules/helpers/go2make; \
+ fi
hack/run-in-gopath.sh go2make \
k8s.io/kubernetes/... \
--prune k8s.io/kubernetes/staging \
--
2.26.2
hack/run-in-gopath.sh go2make \
k8s.io/kubernetes/... \
--prune k8s.io/kubernetes/staging \

10
recipes-containers/kubernetes/kubernetes/0001-hack-lib-golang.sh-use-CC-from-environment.patch
View File

@ -11,12 +11,12 @@ Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
hack/lib/golang.sh | 4 ----
1 file changed, 4 deletions(-)
Index: kubernetes-v1.20.0-rc.3+git98bc258bf5516b6c60860e06845b899eab29825d/src/import/hack/lib/golang.sh
Index: kubernetes-v1.21.1+git45da3fc33872083fb225c1a8c4d03e530d6f7630/src/import/hack/lib/golang.sh
===================================================================
--- kubernetes-v1.20.0-rc.3+git98bc258bf5516b6c60860e06845b899eab29825d.orig/src/import/hack/lib/golang.sh
+++ kubernetes-v1.20.0-rc.3+git98bc258bf5516b6c60860e06845b899eab29825d/src/import/hack/lib/golang.sh
@@ -400,19 +400,15 @@
case "${platform}" in
--- kubernetes-v1.21.1+git45da3fc33872083fb225c1a8c4d03e530d6f7630.orig/src/import/hack/lib/golang.sh
+++ kubernetes-v1.21.1+git45da3fc33872083fb225c1a8c4d03e530d6f7630/src/import/hack/lib/golang.sh
@@ -414,19 +414,15 @@
;;
"linux/arm")
export CGO_ENABLED=1
- export CC=${KUBE_LINUX_ARM_CC:-arm-linux-gnueabihf-gcc}

8
recipes-containers/kubernetes/kubernetes_git.bb
View File

@ -5,11 +5,11 @@ applications across multiple hosts, providing basic mechanisms for deployment, \
maintenance, and scaling of applications. \
"
PV = "v1.20.4+git${SRCREV_kubernetes}"
SRCREV_kubernetes = "e87da0bd6e03ec3fea7933c4b5263d151aafd07c"
SRCREV_kubernetes-release = "cf1e18a801c2ec6cc8c3d3b83bf1cbc4cf0dbc53"
PV = "v1.21.1+git${SRCREV_kubernetes}"
SRCREV_kubernetes = "45da3fc33872083fb225c1a8c4d03e530d6f7630"
SRCREV_kubernetes-release = "7c1aa83dac555de6f05500911467b70aca4949f0"
SRC_URI = "git://github.com/kubernetes/kubernetes.git;branch=release-1.20;name=kubernetes \
SRC_URI = "git://github.com/kubernetes/kubernetes.git;branch=release-1.21;name=kubernetes \
git://github.com/kubernetes/release;branch=master;name=kubernetes-release;destsuffix=git/release \
file://0001-hack-lib-golang.sh-use-CC-from-environment.patch \
file://0001-cross-don-t-build-tests-by-default.patch \