diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2019-12-09 16:10:59 +0800 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2019-12-10 02:26:15 -0500 |
commit | 06dad20a32c81b6a8b6e93c99cda6f1133abddc6 (patch) | |
tree | 330233c2bf4c12dfa7d2bed28384ca1ede512b38 /recipes-containers/kubernetes/go-1.12/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch | |
parent | c31e46fce79f32a6692358105e15d77c652a9c9a (diff) | |
download | meta-virtualization-06dad20a32c81b6a8b6e93c99cda6f1133abddc6.tar.gz |
go: add back 1.12 version to avoid compilation failure
go 1.12 was removed from oe-core, but currently k8s cannot
be built successfully with go 1.13. See link below.
https://github.com/kubernetes/kubernetes/issues/82531
We need to wait for k8s to support go 1.13 and update it
to latest release, as well as its depedencies. Before this
is done, add back go 1.12 and use it.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat (limited to 'recipes-containers/kubernetes/go-1.12/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch')
-rw-r--r-- | recipes-containers/kubernetes/go-1.12/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/recipes-containers/kubernetes/go-1.12/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch b/recipes-containers/kubernetes/go-1.12/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch new file mode 100644 index 00000000..ace8de9e --- /dev/null +++ b/recipes-containers/kubernetes/go-1.12/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | From 1bf15aa8fb773604b2524cfdab493fa4d8fa9285 Mon Sep 17 00:00:00 2001 | ||
2 | From: Matt Madison <matt@madison.systems> | ||
3 | Date: Sat, 17 Feb 2018 06:32:45 -0800 | ||
4 | Subject: [PATCH] make.bash: override CC when building dist and go_bootstrap | ||
5 | |||
6 | for handling OE cross-canadian builds. | ||
7 | |||
8 | Upstream-Status: Inappropriate [OE specific] | ||
9 | |||
10 | Signed-off-by: Matt Madison <matt@madison.systems> | ||
11 | |||
12 | --- | ||
13 | src/make.bash | 4 ++-- | ||
14 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
15 | |||
16 | diff --git a/src/make.bash b/src/make.bash | ||
17 | index 78882d9..25943d0 100755 | ||
18 | --- a/src/make.bash | ||
19 | +++ b/src/make.bash | ||
20 | @@ -163,7 +163,7 @@ if [ "$GOROOT_BOOTSTRAP" = "$GOROOT" ]; then | ||
21 | exit 1 | ||
22 | fi | ||
23 | rm -f cmd/dist/dist | ||
24 | -GOROOT="$GOROOT_BOOTSTRAP" GOOS="" GOARCH="" "$GOROOT_BOOTSTRAP/bin/go" build -o cmd/dist/dist ./cmd/dist | ||
25 | +CC="${BUILD_CC:-${CC}}" GOROOT="$GOROOT_BOOTSTRAP" GOOS="" GOARCH="" "$GOROOT_BOOTSTRAP/bin/go" build -o cmd/dist/dist ./cmd/dist | ||
26 | |||
27 | # -e doesn't propagate out of eval, so check success by hand. | ||
28 | eval $(./cmd/dist/dist env -p || echo FAIL=true) | ||
29 | @@ -194,7 +194,7 @@ fi | ||
30 | # Run dist bootstrap to complete make.bash. | ||
31 | # Bootstrap installs a proper cmd/dist, built with the new toolchain. | ||
32 | # Throw ours, built with Go 1.4, away after bootstrap. | ||
33 | -./cmd/dist/dist bootstrap $buildall $vflag $GO_DISTFLAGS "$@" | ||
34 | +CC="${BUILD_CC:-${CC}}" ./cmd/dist/dist bootstrap $buildall $vflag $GO_DISTFLAGS "$@" | ||
35 | rm -f ./cmd/dist/dist | ||
36 | |||
37 | # DO NOT ADD ANY NEW CODE HERE. | ||