Skip to content

Commit e1bec2e

Browse files
committed
remove hyperkit from all Makefile targets
1 parent b3ff98c commit e1bec2e

File tree

1 file changed

+2
-39
lines changed

1 file changed

+2
-39
lines changed

Makefile

Lines changed: 2 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -625,8 +625,8 @@ out/repodata/repomd.xml: out/minikube-$(RPM_VERSION).rpm
625625
.SECONDEXPANSION:
626626
TAR_TARGETS_linux-amd64 := out/minikube-linux-amd64
627627
TAR_TARGETS_linux-arm64 := out/minikube-linux-arm64
628-
TAR_TARGETS_darwin-amd64 := out/minikube-darwin-amd64 out/docker-machine-driver-hyperkit
629-
TAR_TARGETS_darwin-arm64 := out/minikube-darwin-arm64 #out/docker-machine-driver-hyperkit
628+
TAR_TARGETS_darwin-amd64 := out/minikube-darwin-amd64
629+
TAR_TARGETS_darwin-arm64 := out/minikube-darwin-arm64
630630
TAR_TARGETS_windows-amd64 := out/minikube-windows-amd64.exe
631631
out/minikube-%.tar.gz: $$(TAR_TARGETS_$$*)
632632
$(if $(quiet),@echo " TAR $@")
@@ -650,43 +650,6 @@ out/minikube-installer.exe: out/minikube-windows-amd64.exe
650650
mv out/windows_tmp/minikube-installer.exe out/minikube-installer.exe
651651
rm -rf out/windows_tmp
652652

653-
out/docker-machine-driver-hyperkit:
654-
ifeq ($(MINIKUBE_BUILD_IN_DOCKER),y)
655-
docker run --rm -e GOCACHE=/app/.cache -e IN_DOCKER=1 \
656-
--user $(shell id -u):$(shell id -g) -w /app \
657-
-v $(PWD):/app:Z -v $(GOPATH):/go:Z --init --entrypoint "" \
658-
$(HYPERKIT_BUILD_IMAGE) /bin/bash -c 'CC=o64-clang CXX=o64-clang++ /usr/bin/make $@'
659-
else
660-
$(if $(quiet),@echo " GO $@")
661-
$(Q)GOOS=darwin CGO_ENABLED=1 go build \
662-
-ldflags="$(HYPERKIT_LDFLAGS)" \
663-
-o $@ k8s.io/minikube/cmd/drivers/hyperkit
664-
endif
665-
666-
hyperkit_in_docker:
667-
rm -f out/docker-machine-driver-hyperkit
668-
$(MAKE) MINIKUBE_BUILD_IN_DOCKER=y out/docker-machine-driver-hyperkit
669-
670-
.PHONY: install-hyperkit-driver
671-
install-hyperkit-driver: out/docker-machine-driver-hyperkit ## Install hyperkit to local machine
672-
mkdir -p $(HOME)/bin
673-
sudo cp out/docker-machine-driver-hyperkit $(HOME)/bin/docker-machine-driver-hyperkit
674-
sudo chown root:wheel $(HOME)/bin/docker-machine-driver-hyperkit
675-
sudo chmod u+s $(HOME)/bin/docker-machine-driver-hyperkit
676-
677-
.PHONY: release-hyperkit-driver
678-
release-hyperkit-driver: install-hyperkit-driver checksum ## Copy hyperkit using gsutil
679-
gsutil cp $(GOBIN)/docker-machine-driver-hyperkit gs://minikube/drivers/hyperkit/$(VERSION)/
680-
gsutil cp $(GOBIN)/docker-machine-driver-hyperkit.sha256 gs://minikube/drivers/hyperkit/$(VERSION)/
681-
682-
.PHONY: build-and-push-hyperkit-build-image
683-
build-and-push-hyperkit-build-image:
684-
test -d out/xcgo || git clone https://github.com/neilotoole/xcgo.git out/xcgo
685-
(cd out/xcgo && git restore . && git pull && \
686-
sed -i'.bak' -e 's/ARG GO_VERSION.*/ARG GO_VERSION="go$(GO_VERSION)"/' Dockerfile && \
687-
docker build -t gcr.io/k8s-minikube/xcgo:go$(GO_VERSION) .)
688-
docker push gcr.io/k8s-minikube/xcgo:go$(GO_VERSION)
689-
690653
.PHONY: check-release
691654
check-release: ## Execute go test
692655
go test -timeout 42m -v ./deploy/minikube/release_sanity_test.go

0 commit comments

Comments
 (0)