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/0008-use-GOBUILDMODE-to-set-buildmode.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/0008-use-GOBUILDMODE-to-set-buildmode.patch')
-rw-r--r-- | recipes-containers/kubernetes/go-1.12/0008-use-GOBUILDMODE-to-set-buildmode.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/recipes-containers/kubernetes/go-1.12/0008-use-GOBUILDMODE-to-set-buildmode.patch b/recipes-containers/kubernetes/go-1.12/0008-use-GOBUILDMODE-to-set-buildmode.patch new file mode 100644 index 00000000..225cf439 --- /dev/null +++ b/recipes-containers/kubernetes/go-1.12/0008-use-GOBUILDMODE-to-set-buildmode.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | From 0e0c247f0caec23528889ff09d98348cba9028f1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | ||
3 | Date: Fri, 26 Oct 2018 15:02:32 +0800 | ||
4 | Subject: [PATCH] use GOBUILDMODE to set buildmode | ||
5 | |||
6 | While building go itself, the go build system does not support | ||
7 | to set `-buildmode=pie' from environment. | ||
8 | |||
9 | Add GOBUILDMODE to support it which make PIE executables the default | ||
10 | build mode, as PIE executables are required as of Yocto | ||
11 | |||
12 | Refers: https://groups.google.com/forum/#!topic/golang-dev/gRCe5URKewI | ||
13 | Upstream-Status: Denied [upstream choose antoher solution: `17a256b | ||
14 | cmd/go: -buildmode=pie for android/arm'] | ||
15 | |||
16 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
17 | --- | ||
18 | src/cmd/go/internal/work/build.go | 6 +++++- | ||
19 | 1 file changed, 5 insertions(+), 1 deletion(-) | ||
20 | |||
21 | Index: go/src/cmd/go/internal/work/build.go | ||
22 | =================================================================== | ||
23 | --- go.orig/src/cmd/go/internal/work/build.go | ||
24 | +++ go/src/cmd/go/internal/work/build.go | ||
25 | @@ -223,7 +223,11 @@ func AddBuildFlags(cmd *base.Command) { | ||
26 | |||
27 | cmd.Flag.Var(&load.BuildAsmflags, "asmflags", "") | ||
28 | cmd.Flag.Var(buildCompiler{}, "compiler", "") | ||
29 | - cmd.Flag.StringVar(&cfg.BuildBuildmode, "buildmode", "default", "") | ||
30 | + if bm := os.Getenv("GOBUILDMODE"); bm != "" { | ||
31 | + cmd.Flag.StringVar(&cfg.BuildBuildmode, "buildmode", bm, "") | ||
32 | + } else { | ||
33 | + cmd.Flag.StringVar(&cfg.BuildBuildmode, "buildmode", "default", "") | ||
34 | + } | ||
35 | cmd.Flag.Var(&load.BuildGcflags, "gcflags", "") | ||
36 | cmd.Flag.Var(&load.BuildGccgoflags, "gccgoflags", "") | ||
37 | cmd.Flag.StringVar(&cfg.BuildMod, "mod", "", "") | ||