kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

remove GOBIN from aarch package defs

pull/13762/head
Sharif Elgamal 2022-04-27 14:27:53 -07:00
parent 09b485fbb1
commit 2fd1db9237
7 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -294,9 +294,9 @@ minikube-iso-%: deploy/iso/minikube-iso/board/minikube/%/rootfs-overlay/usr/bin/
git clone --depth=1 --branch=$(BUILDROOT_BRANCH) https://github.com/buildroot/buildroot $(BUILD_DIR)/buildroot; \
cp deploy/iso/minikube-iso/go.hash $(BUILD_DIR)/buildroot/package/go/go.hash; \
fi;
$(MAKE) -C $(BUILD_DIR)/buildroot $(BUILDROOT_OPTIONS) GOARCH=$(subst x86_64,amd64,$(subst aarch64,arm64,$*)) O=$(BUILD_DIR)/buildroot/output-$* minikube_$*_defconfig
$(MAKE) -C $(BUILD_DIR)/buildroot $(BUILDROOT_OPTIONS) GOARCH=$(subst x86_64,amd64,$(subst aarch64,arm64,$*)) O=$(BUILD_DIR)/buildroot/output-$* host-python
$(MAKE) -C $(BUILD_DIR)/buildroot $(BUILDROOT_OPTIONS) GOARCH=$(subst x86_64,amd64,$(subst aarch64,arm64,$*)) O=$(BUILD_DIR)/buildroot/output-$*
$(MAKE) -C $(BUILD_DIR)/buildroot $(BUILDROOT_OPTIONS) O=$(BUILD_DIR)/buildroot/output-$* minikube_$*_defconfig
$(MAKE) -C $(BUILD_DIR)/buildroot $(BUILDROOT_OPTIONS) O=$(BUILD_DIR)/buildroot/output-$* host-python
$(MAKE) -C $(BUILD_DIR)/buildroot $(BUILDROOT_OPTIONS) O=$(BUILD_DIR)/buildroot/output-$*
mv $(BUILD_DIR)/buildroot/output-$*/images/boot.iso $(BUILD_DIR)/minikube-$(subst x86_64,amd64,$(subst aarch64,arm64,$*)).iso

1
deploy/iso/minikube-iso/arch/aarch64/package/cni-aarch64/cni.mk
View File

@ -18,7 +18,6 @@ CNI_MAKE_ENV = \
CGO_ENABLED=0 \
GO111MODULE=off \
GOPATH="$(CNI_GOPATH)" \
GOBIN="$(CNI_GOPATH)/bin" \
PATH=$(CNI_GOPATH)/bin:$(BR_PATH) \
GOARCH=arm64

1
deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.mk
View File

@ -14,7 +14,6 @@ CONTAINERD_BIN_ENV = \
CGO_ENABLED=1 \
GO111MODULE=off \
GOPATH="$(CONTAINERD_BIN_GOPATH)" \
GOBIN="$(CONTAINERD_BIN_GOPATH)/bin" \
PATH=$(CONTAINERD_BIN_GOPATH)/bin:$(BR_PATH) \
GOARCH=arm64

1
deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.mk
View File

@ -19,7 +19,6 @@ CRI_DOCKERD_ENV = \
CGO_ENABLED=0 \
GO111MODULE=on \
GOPATH="$(CRI_DOCKERD_GOPATH)" \
GOBIN="$(CRI_DOCKERD_GOPATH)/bin" \
PATH=$(CRI_DOCKERD_GOPATH)/bin:$(BR_PATH) \
GOARCH=arm64

1
deploy/iso/minikube-iso/arch/aarch64/package/crio-bin-aarch64/crio-bin.mk
View File

@ -15,7 +15,6 @@ CRIO_BIN_ENV = \
CGO_ENABLED=1 \
GO111MODULE=off \
GOPATH="$(CRIO_BIN_GOPATH)" \
GOBIN="$(CRIO_BIN_GOPATH)/bin" \
PATH=$(CRIO_BIN_GOPATH)/bin:$(BR_PATH) \
GOARCH=arm64

1
deploy/iso/minikube-iso/arch/aarch64/package/podman-aarch64/podman.mk
View File

@ -16,7 +16,6 @@ PODMAN_BIN_ENV = \
$(GO_TARGET_ENV) \
CGO_ENABLED=1 \
GOPATH="$(PODMAN_GOPATH)" \
GOBIN="$(PODMAN_GOPATH)/bin" \
PATH=$(PODMAN_GOPATH)/bin:$(BR_PATH) \
GOARCH=arm64

1
deploy/iso/minikube-iso/arch/aarch64/package/runc-aarch64/runc.mk
View File

@ -19,7 +19,6 @@ RUNC_HEAD_MAKE_ENV = \
CGO_ENABLED=1 \
GO111MODULE=off \
GOPATH="$(RUNC_HEAD_GOPATH)" \
GOBIN="$(RUNC_HEAD_GOPATH)/bin" \
PATH=$(RUNC_HEAD_GOPATH)/bin:$(BR_PATH) \
GOARCH=arm64