From 4cb08c846e43440ce3c7acce14fc328b59f5650b Mon Sep 17 00:00:00 2001
From: Jan Chaloupka <jchaloup@redhat.com>
Date: Thu, 13 Apr 2017 14:04:43 +0200
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/src/k8s.io/kubernetes/Makefile b/src/k8s.io/kubernetes/Makefile
index a6b2fbe..41e2d59 100644
--- a/src/k8s.io/kubernetes/Makefile
+++ b/src/k8s.io/kubernetes/Makefile
@@ -39,7 +39,7 @@ MAKEFLAGS += --no-builtin-rules
# Constants used throughout.
.EXPORT_ALL_VARIABLES:
OUT_DIR ?= _output
-BIN_DIR := $(OUT_DIR)/bin
+BIN_DIR := $(OUT_DIR)/local/go/bin
PRJ_SRC_PATH := k8s.io/kubernetes
GENERATED_FILE_PREFIX := zz_generated.
diff --git a/src/k8s.io/kubernetes/hack/lib/init.sh b/src/k8s.io/kubernetes/hack/lib/init.sh
index a07f6f2..b21f907 100644
--- a/src/k8s.io/kubernetes/hack/lib/init.sh
+++ b/src/k8s.io/kubernetes/hack/lib/init.sh
@@ -46,7 +46,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="${KUBE_OUTPUT_BINPATH}/$(kube::util::host_platform)"
+KUBE_OUTPUT_HOSTBIN="${KUBE_OUTPUT_BINPATH}/usr/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/src/k8s.io/kubernetes/hack/lib/util.sh b/src/k8s.io/kubernetes/hack/lib/util.sh
index 6a0386a..e8d126d 100755
--- a/src/k8s.io/kubernetes/hack/lib/util.sh
+++ b/src/k8s.io/kubernetes/hack/lib/util.sh
@@ -168,7 +168,7 @@ kube::util::find-binary-for-platform() {
local -r lookfor="$1"
local -r platform="$2"
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