diff --git a/Makefile b/Makefile index 75e3fdda0633e03346e8739d4e7a14fb8428c6e9..2de5844699e91119652b7f40d362c7750549a80e 100644 --- a/Makefile +++ b/Makefile @@ -84,6 +84,7 @@ export GO111MODULE := on GOOS ?= $(shell go env GOOS) GOARCH ?= $(shell go env GOARCH) +GOARM ?= 7 # the default is 5 GOPATH ?= $(shell go env GOPATH) BUILD_DIR ?= ./out $(shell mkdir -p $(BUILD_DIR)) @@ -191,7 +192,7 @@ endif out/minikube$(IS_EXE): $(SOURCE_GENERATED) $(SOURCE_FILES) go.mod ifeq ($(MINIKUBE_BUILD_IN_DOCKER),y) - $(call DOCKER,$(BUILD_IMAGE),GOOS=$(GOOS) GOARCH=$(GOARCH) /usr/bin/make $@) + $(call DOCKER,$(BUILD_IMAGE),GOOS=$(GOOS) GOARCH=$(GOARCH) GOARM=$(GOARM) /usr/bin/make $@) else $(if $(quiet),@echo " GO $@") $(Q)go build $(MINIKUBE_GOFLAGS) -tags "$(MINIKUBE_BUILD_TAGS)" -ldflags="$(MINIKUBE_LDFLAGS)" -o $@ k8s.io/minikube/cmd/minikube @@ -205,6 +206,14 @@ out/minikube-linux-x86_64: out/minikube-linux-amd64 $(if $(quiet),@echo " CP $@") $(Q)cp $< $@ +out/minikube-linux-armhf: out/minikube-linux-arm + $(if $(quiet),@echo " CP $@") + $(Q)cp $< $@ + +out/minikube-linux-armv7hl: out/minikube-linux-arm + $(if $(quiet),@echo " CP $@") + $(Q)cp $< $@ + out/minikube-linux-aarch64: out/minikube-linux-arm64 $(if $(quiet),@echo " CP $@") $(Q)cp $< $@ @@ -224,12 +233,14 @@ minikube-darwin-arm64: out/minikube-darwin-arm64 ## Build Minikube for Darwin AR .PHONY: minikube-windows-amd64.exe minikube-windows-amd64.exe: out/minikube-windows-amd64.exe ## Build Minikube for Windows 64bit +eq = $(and $(findstring x$(1),x$(2)),$(findstring x$(2),x$(1))) + out/minikube-%: $(SOURCE_GENERATED) $(SOURCE_FILES) ifeq ($(MINIKUBE_BUILD_IN_DOCKER),y) $(call DOCKER,$(BUILD_IMAGE),/usr/bin/make $@) else $(if $(quiet),@echo " GO $@") - $(Q)GOOS="$(firstword $(subst -, ,$*))" GOARCH="$(lastword $(subst -, ,$(subst $(IS_EXE), ,$*)))" \ + $(Q)GOOS="$(firstword $(subst -, ,$*))" GOARCH="$(lastword $(subst -, ,$(subst $(IS_EXE), ,$*)))" $(if $(call eq,$(lastword $(subst -, ,$(subst $(IS_EXE), ,$*))),arm),GOARM=$(GOARM))\ go build -tags "$(MINIKUBE_BUILD_TAGS)" -ldflags="$(MINIKUBE_LDFLAGS)" -a -o $@ k8s.io/minikube/cmd/minikube endif diff --git a/hack/jenkins/release_build_and_upload.sh b/hack/jenkins/release_build_and_upload.sh index b43a1152c018ab630a5e83ba32d920492afb9c38..19f55e0a6c9e3bdd196a12b05451fc73d3704b14 100755 --- a/hack/jenkins/release_build_and_upload.sh +++ b/hack/jenkins/release_build_and_upload.sh @@ -52,10 +52,12 @@ env BUILD_IN_DOCKER=y \ out/minikube-installer.exe \ "out/minikube_${DEB_VERSION}-${DEB_REVISION}_amd64.deb" \ "out/minikube_${DEB_VERSION}-${DEB_REVISION}_arm64.deb" \ + "out/minikube_${DEB_VERSION}-${DEB_REVISION}_armhf.deb" \ "out/minikube_${DEB_VERSION}-${DEB_REVISION}_ppc64el.deb" \ "out/minikube_${DEB_VERSION}-${DEB_REVISION}_s390x.deb" \ "out/minikube-${RPM_VERSION}-${RPM_REVISION}.x86_64.rpm" \ "out/minikube-${RPM_VERSION}-${RPM_REVISION}.aarch64.rpm" \ + "out/minikube-${RPM_VERSION}-${RPM_REVISION}.armv7hl.rpm" \ "out/minikube-${RPM_VERSION}-${RPM_REVISION}.ppc64le.rpm" \ "out/minikube-${RPM_VERSION}-${RPM_REVISION}.s390x.rpm" \ "out/docker-machine-driver-kvm2_${DEB_VERSION}-${DEB_REVISION}_amd64.deb" \ @@ -74,6 +76,8 @@ fi # Don't upload temporary copies, avoid unused duplicate files in the release storage rm -f out/minikube-linux-x86_64 rm -f out/minikube-linux-aarch64 +rm -f out/minikube-linux-armhf +rm -f out/minikube-linux-armv7hl rm -f out/minikube-linux-ppc64el rm -f out/minikube-windows-amd64