From 535a3e82791322b0484ac4a6a05600afe3cf0647 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Wed, 12 Aug 2020 17:01:38 +0000 Subject: k8s: fix 32bit ARM build Remove the remaining 'go' calls, and replace them with $GO. We also must explicitly pass "GO='go'" on the host side build call. This avoids the gnu-stubs header file issues, since the 'go' binary cannot use the sysroot. Signed-off-by: Bruce Ashfield --- recipes-containers/kubernetes/kubernetes_git.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'recipes-containers/kubernetes/kubernetes_git.bb') diff --git a/recipes-containers/kubernetes/kubernetes_git.bb b/recipes-containers/kubernetes/kubernetes_git.bb index 2cc2bcdf..76c82026 100644 --- a/recipes-containers/kubernetes/kubernetes_git.bb +++ b/recipes-containers/kubernetes/kubernetes_git.bb @@ -14,6 +14,7 @@ SRC_URI = "git://github.com/kubernetes/kubernetes.git;branch=release-1.19;name=k file://0001-hack-lib-golang.sh-use-CC-from-environment.patch \ file://0001-cross-don-t-build-tests-by-default.patch \ file://0001-generate-bindata-unset-GOBIN.patch \ + file://0001-build-golang.sh-convert-remaining-go-calls-to-use.patch \ " DEPENDS += "rsync-native \ @@ -50,7 +51,7 @@ do_compile() { export CC="${BUILD_CC}" export LD="${BUILD_LD}" - make generated_files KUBE_BUILD_PLATFORMS="${HOST_GOOS}/${BUILD_GOARCH}" + make generated_files GO="go" KUBE_BUILD_PLATFORMS="${HOST_GOOS}/${BUILD_GOARCH}" # Build the target binaries export GOARCH="${TARGET_GOARCH}" @@ -65,7 +66,7 @@ do_compile() { export GOBIN="" # to limit what is built, use 'WHAT', i.e. make WHAT=cmd/kubelet - make cross GO=${GO} KUBE_BUILD_PLATFORMS=${GOOS}/${GOARCH} GOLDFLAGS="" + make cross CGO_FLAGS=${CGO_FLAGS} GO=${GO} KUBE_BUILD_PLATFORMS=${GOOS}/${GOARCH} GOLDFLAGS="" } do_install() { -- cgit v1.2.3-54-g00ecf