From 123760e97e4dae27d33a5af5caa349c065dd70c9 Mon Sep 17 00:00:00 2001
From: Steven Powell <spowellgrr@gmail.com>
Date: Tue, 14 Sep 2021 12:42:26 -0700
Subject: [PATCH] update host-go version

---
 Makefile                        | 13 ++++++++-----
 deploy/iso/minikube-iso/go.hash |  4 ++++
 2 files changed, 12 insertions(+), 5 deletions(-)
 create mode 100644 deploy/iso/minikube-iso/go.hash

diff --git a/Makefile b/Makefile
index 0ce4cad8e2..3291ef5151 100644
--- a/Makefile
+++ b/Makefile
@@ -43,6 +43,8 @@ KVM_GO_VERSION ?= $(GO_VERSION:.0=)
 
 INSTALL_SIZE ?= $(shell du out/minikube-windows-amd64.exe | cut -f1)
 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
 
 # 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 \
 		mkdir -p $(BUILD_DIR); \
 		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;
-	$(MAKE) BR2_EXTERNAL=../../deploy/iso/minikube-iso minikube_defconfig -C $(BUILD_DIR)/buildroot
-	$(MAKE) -C $(BUILD_DIR)/buildroot host-python
-	$(MAKE) -C $(BUILD_DIR)/buildroot
+	$(MAKE) BR2_EXTERNAL=../../deploy/iso/minikube-iso minikube_defconfig -C $(BUILD_DIR)/buildroot $(BUILDROOT_OPTIONS)
+	$(MAKE) -C $(BUILD_DIR)/buildroot $(BUILDROOT_OPTIONS) host-python
+	$(MAKE) -C $(BUILD_DIR)/buildroot $(BUILDROOT_OPTIONS)
 	mv $(BUILD_DIR)/buildroot/output/images/rootfs.iso9660 $(BUILD_DIR)/minikube.iso
 
 # Change buildroot configuration for the minikube ISO
 .PHONY: iso-menuconfig
 iso-menuconfig: ## Configure buildroot configuration
-	$(MAKE) -C $(BUILD_DIR)/buildroot menuconfig
-	$(MAKE) -C $(BUILD_DIR)/buildroot savedefconfig
+	$(MAKE) -C $(BUILD_DIR)/buildroot $(BUILDROOT_OPTIONS) menuconfig
+	$(MAKE) -C $(BUILD_DIR)/buildroot $(BUILDROOT_OPTIONS) savedefconfig
 
 # Change the kernel configuration for the minikube ISO
 .PHONY: linux-menuconfig
diff --git a/deploy/iso/minikube-iso/go.hash b/deploy/iso/minikube-iso/go.hash
new file mode 100644
index 0000000000..8a04dc3b71
--- /dev/null
+++ b/deploy/iso/minikube-iso/go.hash
@@ -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