|
 |
9efe74b |
From 8585e6e6245a7e42e1ef767ea34d0bb08ca56e47 Mon Sep 17 00:00:00 2001
|
|
|
2c89a45 |
From: Jan Chaloupka <jchaloup@redhat.com>
|
|
|
9efe74b |
Date: Mon, 17 Jul 2017 14:22:29 +0200
|
|
|
d741110 |
Subject: [PATCH] fix support for ppc64le
|
|
|
2c89a45 |
|
|
|
2c89a45 |
---
|
|
|
9efe74b |
src/k8s.io/kubernetes/build/root/Makefile | 2 +-
|
|
|
9efe74b |
src/k8s.io/kubernetes/hack/lib/init.sh | 2 +-
|
|
|
9efe74b |
src/k8s.io/kubernetes/hack/lib/util.sh | 2 +-
|
|
|
49e8173 |
3 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
2c89a45 |
|
|
|
9efe74b |
diff --git a/src/k8s.io/kubernetes/build/root/Makefile b/src/k8s.io/kubernetes/build/root/Makefile
|
|
|
9efe74b |
index ea5eec8..5a88385 100644
|
|
|
9efe74b |
--- a/src/k8s.io/kubernetes/build/root/Makefile
|
|
|
9efe74b |
+++ b/src/k8s.io/kubernetes/build/root/Makefile
|
|
|
d741110 |
@@ -39,7 +39,7 @@ MAKEFLAGS += --no-builtin-rules
|
|
|
d741110 |
# Constants used throughout.
|
|
|
d741110 |
.EXPORT_ALL_VARIABLES:
|
|
|
d741110 |
OUT_DIR ?= _output
|
|
|
d741110 |
-BIN_DIR := $(OUT_DIR)/bin
|
|
|
d741110 |
+BIN_DIR := $(OUT_DIR)/local/go/bin
|
|
|
d741110 |
PRJ_SRC_PATH := k8s.io/kubernetes
|
|
|
d741110 |
GENERATED_FILE_PREFIX := zz_generated.
|
|
|
d741110 |
|
|
|
fc55ab8 |
diff --git a/src/k8s.io/kubernetes/hack/lib/init.sh b/src/k8s.io/kubernetes/hack/lib/init.sh
|
|
|
9efe74b |
index 02aba9e..a53f326 100755
|
|
|
fc55ab8 |
--- a/src/k8s.io/kubernetes/hack/lib/init.sh
|
|
|
fc55ab8 |
+++ b/src/k8s.io/kubernetes/hack/lib/init.sh
|
|
|
9efe74b |
@@ -45,7 +45,7 @@ source "${KUBE_ROOT}/hack/lib/version.sh"
|
|
|
fc55ab8 |
source "${KUBE_ROOT}/hack/lib/golang.sh"
|
|
|
fc55ab8 |
source "${KUBE_ROOT}/hack/lib/etcd.sh"
|
|
|
2c89a45 |
|
|
|
b0ef5e0 |
-KUBE_OUTPUT_HOSTBIN="${KUBE_OUTPUT_BINPATH}/$(kube::util::host_platform)"
|
|
|
b0ef5e0 |
+KUBE_OUTPUT_HOSTBIN="${KUBE_OUTPUT_BINPATH}/usr/bin"
|
|
|
2c89a45 |
|
|
|
fc55ab8 |
# list of all available group versions. This should be used when generated code
|
|
|
fc55ab8 |
# or when starting an API server that you want to have everything.
|
|
|
fc55ab8 |
diff --git a/src/k8s.io/kubernetes/hack/lib/util.sh b/src/k8s.io/kubernetes/hack/lib/util.sh
|
|
|
9efe74b |
index 50f6b55..c8a8b5e 100755
|
|
|
fc55ab8 |
--- a/src/k8s.io/kubernetes/hack/lib/util.sh
|
|
|
fc55ab8 |
+++ b/src/k8s.io/kubernetes/hack/lib/util.sh
|
|
|
fc55ab8 |
@@ -168,7 +168,7 @@ kube::util::find-binary-for-platform() {
|
|
|
fc55ab8 |
local -r lookfor="$1"
|
|
|
fc55ab8 |
local -r platform="$2"
|
|
|
b0ef5e0 |
local locations=(
|
|
|
49e8173 |
- "${KUBE_ROOT}/_output/bin/${lookfor}"
|
|
|
49e8173 |
+ "${KUBE_ROOT}/_output/local/go/bin/${lookfor}"
|
|
|
fc55ab8 |
"${KUBE_ROOT}/_output/dockerized/bin/${platform}/${lookfor}"
|
|
|
fc55ab8 |
"${KUBE_ROOT}/_output/local/bin/${platform}/${lookfor}"
|
|
|
fc55ab8 |
"${KUBE_ROOT}/platforms/${platform}/${lookfor}"
|
|
|
2c89a45 |
--
|
|
|
9efe74b |
2.7.5
|
|
|
2c89a45 |
|