From 2bdaa87387d7d02afb52ccc0fee1f0f017ce5ecc Mon Sep 17 00:00:00 2001 From: Jan Chaloupka 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 @@ -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/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 --- 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=( - "${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