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

kubernetes: Fix race issue for installing go2make

Browse Source 
The src/import/build/root/Makefile.generated_files are called several times
during the build, so the following target which installs go2make will also run
several times:

$(META_DIR)/$(GO_PKGDEPS_FILE): FORCE

It runs automatically when the Makefile is called because of:
sinclude $(META_DIR)/$(GO_PKGDEPS_FILE)

So there is a race issue of go2make when parallel build:
hack/run-in-gopath.sh: line 34: build/tmp-glibc/work/corei7-64-wrs-linux/kubernetes/1.18.8-r0/git/src/import/_output/local/go/bin/go2make: No suc h file or directory

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
This commit is contained in:
Robert Yang 2020-10-15 02:01:04 -07:00 committed by Bruce Ashfield
parent 80d83eacda
commit 28fda6d848
2 changed files with 49 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -0,0 +1,48 @@
From 441df8a24a2c80e320f140b5d9bc352c7ce8a64a Mon Sep 17 00:00:00 2001
From: Robert Yang <liezhi.yang@windriver.com>
Date: Thu, 15 Oct 2020 07:27:35 +0000
Subject: [PATCH] src/import/build/root/Makefile.generated_files: Fix race issue for installing
go2make
The src/import/build/root/Makefile.generated_files are called several times during the build, so the
following target which installs go2make will also run several times:
$(META_DIR)/$(GO_PKGDEPS_FILE): FORCE
It runs automatically when the Makefile is called because of:
sinclude $(META_DIR)/$(GO_PKGDEPS_FILE)
So there is a race issue of go2make when parallel build:
hack/run-in-gopath.sh: line 34: build/tmp-glibc/work/corei7-64-wrs-linux/kubernetes/1.18.8-r0/git/src/import/_output/local/go/bin/go2make: No such file or directory
It is because the first process is using go2make, but then the second process
removes it and reinstall it.
Check whether go2make has been installed or not before install it can fix the
problem.
Upstream-Status: Pending
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
if [[ "$(DBG_CODEGEN)" == 1 ]]; then \
echo "DBG: calculating Go dependencies"; \
fi
- hack/run-in-gopath.sh go install ./hack/make-rules/helpers/go2make
+ 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

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

@ -15,6 +15,7 @@ SRC_URI = "git://github.com/kubernetes/kubernetes.git;branch=release-1.19;name=k
file://0001-cross-don-t-build-tests-by-default.patch \ file://0001-cross-don-t-build-tests-by-default.patch \
file://0001-generate-bindata-unset-GOBIN.patch \ file://0001-generate-bindata-unset-GOBIN.patch \
file://0001-build-golang.sh-convert-remaining-go-calls-to-use.patch \ file://0001-build-golang.sh-convert-remaining-go-calls-to-use.patch \
file://0001-Makefile.generated_files-Fix-race-issue-for-installi.patch \
" "
DEPENDS += "rsync-native \ DEPENDS += "rsync-native \