diff options
Diffstat (limited to 'recipes-containers/kubernetes/kubernetes/0001-build-golang.sh-convert-remaining-go-calls-to-use.patch')
| -rw-r--r-- | recipes-containers/kubernetes/kubernetes/0001-build-golang.sh-convert-remaining-go-calls-to-use.patch | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/recipes-containers/kubernetes/kubernetes/0001-build-golang.sh-convert-remaining-go-calls-to-use.patch b/recipes-containers/kubernetes/kubernetes/0001-build-golang.sh-convert-remaining-go-calls-to-use.patch index 8adbafb3..ae956794 100644 --- a/recipes-containers/kubernetes/kubernetes/0001-build-golang.sh-convert-remaining-go-calls-to-use.patch +++ b/recipes-containers/kubernetes/kubernetes/0001-build-golang.sh-convert-remaining-go-calls-to-use.patch @@ -3,16 +3,18 @@ From: Bruce Ashfield <bruce.ashfield@gmail.com> Date: Wed, 12 Aug 2020 16:01:49 +0000 Subject: [PATCH] build/golang.sh: convert remaining 'go' calls to use +Upstream-Status: Inappropriate [embedded specific] + Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> --- hack/lib/golang.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -diff --git a/src/import/hack/lib/golang.sh b/src/import/hack/lib/golang.sh -index e9148ec08fa..71d3c987563 100755 ---- a/src/import/hack/lib/golang.sh -+++ b/src/import/hack/lib/golang.sh -@@ -651,7 +651,7 @@ kube::golang::build_some_binaries() { +Index: kubernetes/hack/lib/golang.sh +=================================================================== +--- kubernetes.orig/hack/lib/golang.sh ++++ kubernetes/hack/lib/golang.sh +@@ -689,7 +689,7 @@ kube::golang::create_coverage_dummy_test "${package}" kube::util::trap_add "kube::golang::delete_coverage_dummy_test \"${package}\"" EXIT @@ -21,31 +23,28 @@ index e9148ec08fa..71d3c987563 100755 -covermode count \ -coverpkg k8s.io/...,k8s.io/kubernetes/vendor/k8s.io/... \ "${build_args[@]}" \ -@@ -663,13 +663,13 @@ kube::golang::build_some_binaries() { +@@ -701,13 +701,13 @@ done if [[ "${#uncovered[@]}" != 0 ]]; then V=2 kube::log::info "Building ${uncovered[*]} without coverage..." -- go install "${build_args[@]}" "${uncovered[@]}" -+ $GO install "${build_args[@]}" "${uncovered[@]}" +- GO111MODULE=on GOPROXY=off go install "${build_args[@]}" "${uncovered[@]}" ++ GO111MODULE=on GOPROXY=off $GO install "${build_args[@]}" "${uncovered[@]}" else V=2 kube::log::info "Nothing to build without coverage." fi else V=2 kube::log::info "Coverage is disabled." -- go install "${build_args[@]}" "$@" -+ $GO install "${build_args[@]}" "$@" +- GO111MODULE=on GOPROXY=off go install "${build_args[@]}" "$@" ++ GO111MODULE=on GOPROXY=off $GO install "${build_args[@]}" "$@" fi } -@@ -725,7 +725,7 @@ kube::golang::build_binaries_for_platform() { +@@ -769,7 +769,7 @@ testpkg=$(dirname "${test}") mkdir -p "$(dirname "${outfile}")" - go test -c \ + $GO test -c \ ${goflags:+"${goflags[@]}"} \ - -gcflags "${gogcflags:-}" \ - -asmflags "${goasmflags:-}" \ --- -2.19.1 - + -gcflags="${gogcflags}" \ + -asmflags="${goasmflags}" \ |