|
 |
fc55ab8 |
From 2bdaa87387d7d02afb52ccc0fee1f0f017ce5ecc Mon Sep 17 00:00:00 2001
|
|
|
2c89a45 |
From: Jan Chaloupka <jchaloup@redhat.com>
|
|
|
fc55ab8 |
Date: Thu, 5 Jan 2017 12:21:39 +0100
|
|
|
d741110 |
Subject: [PATCH] fix support for ppc64le
|
|
|
2c89a45 |
|
|
|
2c89a45 |
---
|
|
|
fc55ab8 |
src/k8s.io/kubernetes/Makefile | 2 +-
|
|
|
fc55ab8 |
src/k8s.io/kubernetes/hack/lib/init.sh | 2 +-
|
|
|
fc55ab8 |
src/k8s.io/kubernetes/hack/lib/util.sh | 2 +-
|
|
|
49e8173 |
3 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
2c89a45 |
|
|
|
fc55ab8 |
diff --git a/src/k8s.io/kubernetes/Makefile b/src/k8s.io/kubernetes/Makefile
|
|
|
fc55ab8 |
index bce3533..e2f2bf9 100644
|
|
|
fc55ab8 |
--- a/src/k8s.io/kubernetes/Makefile
|
|
|
fc55ab8 |
+++ b/src/k8s.io/kubernetes/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
|
|
|
fc55ab8 |
index 0a601ac..68029e2 100644
|
|
|
fc55ab8 |
--- a/src/k8s.io/kubernetes/hack/lib/init.sh
|
|
|
fc55ab8 |
+++ b/src/k8s.io/kubernetes/hack/lib/init.sh
|
|
|
fc55ab8 |
@@ -42,7 +42,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 |
|
|
|
fc55ab8 |
-KUBE_OUTPUT_HOSTBIN="/usr/bin"
|
|
|
fc55ab8 |
+KUBE_OUTPUT_HOSTBIN="${KUBE_OUTPUT_BINPATH}/go/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
|
|
|
fc55ab8 |
index ada6e34..5911b65 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"
|
|
|
fc55ab8 |
local -r 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 |
--
|
|
|
49e8173 |
2.7.4
|
|
|
2c89a45 |
|