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

kubernetes: uprev to v1.12 release and fix cross compilation errors

Browse Source 
The update to go 1.11 exposed some issues with the cross compilation of
kubernetes. The best way to fix those issues is to uprev to 1.12 and to
inhibit the building of the test modules (which query the host for
infrastructure that is not present).

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
This commit is contained in:
Bruce Ashfield 2018-11-01 10:38:23 -04:00
parent 4bded63c2e
commit 60142aa29a
2 changed files with 37 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
recipes-containers/kubernetes/kubernetes/0001-cross-don-t-build-tests-by-default.patch Normal file
View File

@ -0,0 +1,33 @@
From fa912b53186a047d787c8c456156b9dbdcdf040d Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@windriver.com>
Date: Thu, 1 Nov 2018 10:21:10 -0400
Subject: [PATCH] cross: don't build tests by default
The hack/* build infrastructure doesn't respect the WHAT= commands
that the make infrastructure provides to limit what is built.
In our case, we are cross building and can't build the server test
components without error. As such, we patch the targets out of the
script to allow a successful build.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
hack/make-rules/cross.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/import/hack/make-rules/cross.sh b/hack/make-rules/cross.sh
index 8e1e938..0898c5c 100755
--- a/src/import/hack/make-rules/cross.sh
+++ b/src/import/hack/make-rules/cross.sh
@@ -33,6 +33,6 @@ make all WHAT="${KUBE_NODE_TARGETS[*]}" KUBE_BUILD_PLATFORMS="${KUBE_NODE_PLATFO
make all WHAT="${KUBE_CLIENT_TARGETS[*]}" KUBE_BUILD_PLATFORMS="${KUBE_CLIENT_PLATFORMS[*]}"
-make all WHAT="${KUBE_TEST_TARGETS[*]}" KUBE_BUILD_PLATFORMS="${KUBE_TEST_PLATFORMS[*]}"
+#make all WHAT="${KUBE_TEST_TARGETS[*]}" KUBE_BUILD_PLATFORMS="${KUBE_TEST_PLATFORMS[*]}"
-make all WHAT="${KUBE_TEST_SERVER_TARGETS[*]}" KUBE_BUILD_PLATFORMS="${KUBE_TEST_SERVER_PLATFORMS[*]}"
+#make all WHAT="${KUBE_TEST_SERVER_TARGETS[*]}" KUBE_BUILD_PLATFORMS="${KUBE_TEST_SERVER_PLATFORMS[*]}"
--
2.7.4

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

@ -7,11 +7,12 @@ maintenance, and scaling of applications. \
# Note: 1.11+ requires go 1.10.2+, so the following must be set
# in your configuration: GOVERSION = "1.10%"
PV = "1.11.0+git${SRCREV_kubernetes}"
SRCREV_kubernetes = "210c9cd7e1782e9fe46938fe0368556f2166a528"
PV = "1.12.0+git${SRCREV_kubernetes}"
SRCREV_kubernetes = "d93ba8b6d1e2afcb30da3e354928ed00e6682223"
SRC_URI = "git://github.com/kubernetes/kubernetes.git;branch=release-1.11;name=kubernetes \
SRC_URI = "git://github.com/kubernetes/kubernetes.git;branch=release-1.12;name=kubernetes \
file://0001-hack-lib-golang.sh-use-CC-from-environment.patch \
file://0001-cross-don-t-build-tests-by-default.patch \
"
DEPENDS += "rsync-native \