diff options
Diffstat (limited to 'testing/kubernetes/fix-support-for-ppc64le.patch')
| -rw-r--r-- | testing/kubernetes/fix-support-for-ppc64le.patch | 39 |
1 files changed, 6 insertions, 33 deletions
diff --git a/testing/kubernetes/fix-support-for-ppc64le.patch b/testing/kubernetes/fix-support-for-ppc64le.patch index 820c44c030..0ee4affa7e 100644 --- a/testing/kubernetes/fix-support-for-ppc64le.patch +++ b/testing/kubernetes/fix-support-for-ppc64le.patch @@ -1,18 +1,7 @@ -From 2bdaa87387d7d02afb52ccc0fee1f0f017ce5ecc Mon Sep 17 00:00:00 2001 -From: Jan Chaloupka <jchaloup@redhat.com> -Date: Thu, 5 Jan 2017 12:21:39 +0100 -Subject: [PATCH] fix support for ppc64le - ---- - src/k8s.io/kubernetes/Makefile | 2 +- - src/k8s.io/kubernetes/hack/lib/init.sh | 2 +- - src/k8s.io/kubernetes/hack/lib/util.sh | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/Makefile b/Makefile -index bce3533..e2f2bf9 100644 ---- a/Makefile -+++ b/Makefile +diff --git a/build/root/Makefile b/build/root/Makefile +index ea5eec8..5a88385 100644 +--- a/build/root/Makefile ++++ b/build/root/Makefile @@ -39,7 +39,7 @@ MAKEFLAGS += --no-builtin-rules # Constants used throughout. .EXPORT_ALL_VARIABLES: @@ -22,32 +11,16 @@ index bce3533..e2f2bf9 100644 PRJ_SRC_PATH := k8s.io/kubernetes GENERATED_FILE_PREFIX := zz_generated. -diff --git a/hack/lib/init.sh b/hack/lib/init.sh -index 0a601ac..68029e2 100644 ---- a/hack/lib/init.sh -+++ b/hack/lib/init.sh -@@ -42,7 +42,7 @@ source "${KUBE_ROOT}/hack/lib/version.sh" - source "${KUBE_ROOT}/hack/lib/golang.sh" - source "${KUBE_ROOT}/hack/lib/etcd.sh" - --KUBE_OUTPUT_HOSTBIN="/usr/bin" -+KUBE_OUTPUT_HOSTBIN="${KUBE_OUTPUT_BINPATH}/go/bin" - - # list of all available group versions. This should be used when generated code - # or when starting an API server that you want to have everything. diff --git a/hack/lib/util.sh b/hack/lib/util.sh -index ada6e34..5911b65 100755 +index 50f6b55..c8a8b5e 100755 --- a/hack/lib/util.sh +++ b/hack/lib/util.sh @@ -168,7 +168,7 @@ kube::util::find-binary-for-platform() { local -r lookfor="$1" local -r platform="$2" - local -r locations=( + local locations=( - "${KUBE_ROOT}/_output/bin/${lookfor}" + "${KUBE_ROOT}/_output/local/go/bin/${lookfor}" "${KUBE_ROOT}/_output/dockerized/bin/${platform}/${lookfor}" "${KUBE_ROOT}/_output/local/bin/${platform}/${lookfor}" "${KUBE_ROOT}/platforms/${platform}/${lookfor}" --- -2.7.4 - |