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

k8s: update to v1.17-beta

Browse Source 
Updating to v1.17-beta, so we can drop the GO version 1.12 in
meta-virtualization.

We also drop one patch, since it is part of the upstream now.

Basic sanity tests shows no show-stopper issues.

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
This commit is contained in:
Bruce Ashfield 2020-01-09 17:19:08 +00:00
parent 0df4b0ea71
commit e54873b8b1
3 changed files with 4 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
conf/distro/include/k8s-versions.inc
View File

@ -1,4 +1 @@
# Use go 1.12 to avoid k8s build failure.
# Remove this after https://github.com/kubernetes/kubernetes/issues/82531 is resolved and k8s is updated to a working version.
GOVERSION = "1.12%"
# placeholder for k8s specific versions

69
recipes-containers/kubernetes/kubernetes/0001-fix-compiling-failure-execvp-bin-bash-Argument-list-.patch
View File

@ -1,69 +0,0 @@
From dbca1bfc6ffca8a6536d91a716cb9c5e9bc2f8a0 Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@windriver.com>
Date: Tue, 17 Sep 2019 14:43:30 +0800
Subject: [PATCH] fix compiling failure: execvp: /bin/bash: Argument list too
long
Use GNU Make 4.2.1(such as fedora-29) to build k8s in a long directory,
it failed with `execvp: /bin/bash: Argument list too long'
[snip]
$ cd /buildarea1/hjia/wrlinux-1019/I_/suspect_/that_/if_/you_/create_/your_/project_/in_/a_/very_/deep_/directory/build_master-wr_qemux86-64_faw_2019090509/build/tmp-glibc/work/core2-64-wrs-linux/kubernetes/v1.16.0-alpha+git7054e3ead7e1a00ca6ac3ec47ea355b76061a35a-r0/kubernetes-v1.16.0-alpha+git7054e3ead7e1a00ca6ac3ec47ea355b76061a35a/src/import
$ make cross KUBE_BUILD_PLATFORMS=linux/amd64 GOLDFLAGS=""
|+++ [0804 16:38:32] Building go targets for linux/amd64:
| ./vendor/k8s.io/code-generator/cmd/deepcopy-gen
|make[1]: execvp: /bin/bash: Argument list too long
|make[1]: *** [Makefile.generated_files:184: pkg/kubectl/cmd/testing/zz_generated.deepcopy.go] Error 127
|make: *** [Makefile:557: generated_files] Error 2
...
[snip]
From make manual [1]
$?
The names of all the prerequisites that are newer than the target, with spaces between them.
While two `$?' was passed to bash in a line, it caused above failure,
drop a duplicated one could workaround the issue.
[1] https://www.gnu.org/software/make/manual/html_node/Automatic-Variables.html
Upstream-Status: Submitted [https://github.com/kubernetes/kubernetes/pull/82777]
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
src/import/build/root/Makefile.generated_files | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/import/build/root/Makefile.generated_files b/src/import/build/root/Makefile.generated_files
index 4892325..f17f1f3 100644
--- a/src/import/build/root/Makefile.generated_files
+++ b/src/import/build/root/Makefile.generated_files
@@ -182,7 +182,7 @@ $(META_DIR)/$(DEEPCOPY_GEN).todo: $(DEEPCOPY_FILES)
$(DEEPCOPY_FILES): $(DEEPCOPY_GEN)
if [[ "$(DBG_CODEGEN)" == 1 ]]; then \
- echo "DBG: deepcopy needed $(@D): $?"; \
+ echo "DBG: deepcopy needed $(@D):"; \
ls -lf --full-time $@ $? || true; \
fi
echo $(PRJ_SRC_PATH)/$(@D) >> $(META_DIR)/$(DEEPCOPY_GEN).todo
@@ -276,7 +276,7 @@ $(META_DIR)/$(DEFAULTER_GEN).todo: $(DEFAULTER_FILES)
$(DEFAULTER_FILES): $(DEFAULTER_GEN)
if [[ "$(DBG_CODEGEN)" == 1 ]]; then \
- echo "DBG: defaulter needed $(@D): $?"; \
+ echo "DBG: defaulter needed $(@D):"; \
ls -lf --full-time $@ $? || true; \
fi
echo $(PRJ_SRC_PATH)/$(@D) >> $(META_DIR)/$(DEFAULTER_GEN).todo
@@ -380,7 +380,7 @@ $(META_DIR)/$(CONVERSION_GEN).todo: $(CONVERSION_FILES)
$(CONVERSION_FILES): $(CONVERSION_GEN)
if [[ "$(DBG_CODEGEN)" == 1 ]]; then \
- echo "DBG: conversion needed $(@D): $?"; \
+ echo "DBG: conversion needed $(@D):"; \
ls -lf --full-time $@ $? || true; \
fi
echo $(PRJ_SRC_PATH)/$(@D) >> $(META_DIR)/$(CONVERSION_GEN).todo
--
2.7.4

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

@ -5,13 +5,12 @@ applications across multiple hosts, providing basic mechanisms for deployment, \
maintenance, and scaling of applications. \
"
PV = "v1.16.2+git${SRCREV_kubernetes}"
SRCREV_kubernetes = "c97fe5036ef3df2967d086711e6c0c405941e14b"
PV = "v1.17.1-beta+git${SRCREV_kubernetes}"
SRCREV_kubernetes = "f45fc1861acab22eb6a4697e3fb831e85ef5ff9c"
SRC_URI = "git://github.com/kubernetes/kubernetes.git;branch=release-1.16;name=kubernetes \
SRC_URI = "git://github.com/kubernetes/kubernetes.git;branch=release-1.17;name=kubernetes \
file://0001-hack-lib-golang.sh-use-CC-from-environment.patch \
file://0001-cross-don-t-build-tests-by-default.patch \
file://0001-fix-compiling-failure-execvp-bin-bash-Argument-list-.patch \
"
DEPENDS += "rsync-native \