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

update host-go version

pull/12425/head
Steven Powell 2021-09-14 12:42:26 -07:00
parent 16941e8925
commit 123760e97e
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile
View File

@ -43,6 +43,8 @@ KVM_GO_VERSION ?= $(GO_VERSION:.0=)
INSTALL_SIZE ?= $(shell du out/minikube-windows-amd64.exe | cut -f1) INSTALL_SIZE ?= $(shell du out/minikube-windows-amd64.exe | cut -f1)
BUILDROOT_BRANCH ?= 2021.02.4 BUILDROOT_BRANCH ?= 2021.02.4
GOLANG_OPTIONS = GO_VERSION=1.16.1 GO_HASH_FILE=$(PWD)/deploy/iso/minikube-iso/go.hash
BUILDROOT_OPTIONS = BR2_EXTERNAL=$(PWD)/external $(GOLANG_OPTIONS)
REGISTRY ?= gcr.io/k8s-minikube REGISTRY ?= gcr.io/k8s-minikube
# Get git commit id # Get git commit id
@ -283,17 +285,18 @@ minikube_iso: deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/usr/b
if [ ! -d $(BUILD_DIR)/buildroot ]; then \ if [ ! -d $(BUILD_DIR)/buildroot ]; then \
mkdir -p $(BUILD_DIR); \ mkdir -p $(BUILD_DIR); \
git clone --depth=1 --branch=$(BUILDROOT_BRANCH) https://github.com/buildroot/buildroot $(BUILD_DIR)/buildroot; \ git clone --depth=1 --branch=$(BUILDROOT_BRANCH) https://github.com/buildroot/buildroot $(BUILD_DIR)/buildroot; \
@cp $(PWD)/deploy/iso/minikube-iso/go.hash buildroot/package/go/go.hash
fi; fi;
$(MAKE) BR2_EXTERNAL=../../deploy/iso/minikube-iso minikube_defconfig -C $(BUILD_DIR)/buildroot $(MAKE) BR2_EXTERNAL=../../deploy/iso/minikube-iso minikube_defconfig -C $(BUILD_DIR)/buildroot $(BUILDROOT_OPTIONS)
$(MAKE) -C $(BUILD_DIR)/buildroot host-python $(MAKE) -C $(BUILD_DIR)/buildroot $(BUILDROOT_OPTIONS) host-python
$(MAKE) -C $(BUILD_DIR)/buildroot $(MAKE) -C $(BUILD_DIR)/buildroot $(BUILDROOT_OPTIONS)
mv $(BUILD_DIR)/buildroot/output/images/rootfs.iso9660 $(BUILD_DIR)/minikube.iso mv $(BUILD_DIR)/buildroot/output/images/rootfs.iso9660 $(BUILD_DIR)/minikube.iso
# Change buildroot configuration for the minikube ISO # Change buildroot configuration for the minikube ISO
.PHONY: iso-menuconfig .PHONY: iso-menuconfig
iso-menuconfig: ## Configure buildroot configuration iso-menuconfig: ## Configure buildroot configuration
$(MAKE) -C $(BUILD_DIR)/buildroot menuconfig $(MAKE) -C $(BUILD_DIR)/buildroot $(BUILDROOT_OPTIONS) menuconfig
$(MAKE) -C $(BUILD_DIR)/buildroot savedefconfig $(MAKE) -C $(BUILD_DIR)/buildroot $(BUILDROOT_OPTIONS) savedefconfig
# Change the kernel configuration for the minikube ISO # Change the kernel configuration for the minikube ISO
.PHONY: linux-menuconfig .PHONY: linux-menuconfig

4
deploy/iso/minikube-iso/go.hash Normal file
View File

@ -0,0 +1,4 @@
# From https://golang.org/dl/
sha256 f25b2441d4c76cf63cde94d59bab237cc33e8a2a139040d904c8630f46d061e5 go1.15.11.src.tar.gz
sha256 680a500cd8048750121677dd4dc055fdfd680ae83edc7ed60a4b927e466228eb go1.16.1.src.tar.gz
sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE