Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix make by skipping kvm2-arm64 till 19959 is resolved #20062

Merged
merged 1 commit into from
Dec 10, 2024
Merged

fix make by skipping kvm2-arm64 till 19959 is resolved #20062

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ all: cross drivers e2e-cross cross-tars exotic retro out/gvisor-addon ## Build a
drivers: ## Build Hyperkit and KVM2 drivers
drivers: docker-machine-driver-hyperkit \
docker-machine-driver-kvm2 \
out/docker-machine-driver-kvm2-amd64
out/docker-machine-driver-kvm2-amd64


.PHONY: docker-machine-driver-hyperkit
Expand Down Expand Up @@ -556,7 +556,7 @@ out/docs/minikube.md: $(shell find "cmd") $(shell find "pkg/minikube/constants")
debs: out/minikube_$(DEB_VERSION)-$(DEB_REVISION)_amd64.deb \
out/minikube_$(DEB_VERSION)-$(DEB_REVISION)_arm64.deb \
out/docker-machine-driver-kvm2_$(DEB_VERSION).deb \
out/docker-machine-driver-kvm2_$(DEB_VERSION)-$(DEB_REVISION)_amd64.deb
out/docker-machine-driver-kvm2_$(DEB_VERSION)-$(DEB_REVISION)_amd64.deb
# out/docker-machine-driver-kvm2_$(DEB_VERSION)-$(DEB_REVISION)_arm64.deb

.PHONY: deb_version
Expand Down Expand Up @@ -835,8 +835,11 @@ update-yearly-leaderboard:
hack/yearly-leaderboard.sh

out/docker-machine-driver-kvm2: out/docker-machine-driver-kvm2-$(GOARCH)
# skipping kvm2-arm64 till https://github.com/kubernetes/minikube/issues/19959 is fixed
ifneq ($(GOARCH),arm64)
$(if $(quiet),@echo " CP $@")
$(Q)cp $< $@
endif

out/docker-machine-driver-kvm2-x86_64: out/docker-machine-driver-kvm2-amd64
$(if $(quiet),@echo " CP $@")
Expand Down Expand Up @@ -900,10 +903,10 @@ kvm_in_docker:
install-kvm-driver: out/docker-machine-driver-kvm2 ## Install KVM Driver
mkdir -p $(GOBIN)
cp out/docker-machine-driver-kvm2 $(GOBIN)/docker-machine-driver-kvm2


out/docker-machine-driver-kvm2-arm64:
echo "not used till https://github.com/kubernetes/minikube/issues/19959"
@echo "skipping kvm2-arm64 till https://github.com/kubernetes/minikube/issues/19959 is fixed"
# ifeq ($(MINIKUBE_BUILD_IN_DOCKER),y)
# docker image inspect -f '{{.Id}} {{.RepoTags}}' $(KVM_BUILD_IMAGE_ARM64) || $(MAKE) kvm-image-arm64
# $(call DOCKER,$(KVM_BUILD_IMAGE_ARM64),/usr/bin/make $@ COMMIT=$(COMMIT))
Expand Down Expand Up @@ -938,7 +941,7 @@ endif
chmod +X $@


site/themes/docsy/assets/vendor/bootstrap/package.js: ## update the website docsy theme git submodule
site/themes/docsy/assets/vendor/bootstrap/package.js: ## update the website docsy theme git submodule
git submodule update -f --init

.PHONY: out/hugo/hugo
Expand Down Expand Up @@ -1007,7 +1010,7 @@ compare: out/mkcmp out/minikube
mv out/minikube out/master.minikube
git checkout $(CURRENT_GIT_BRANCH)
out/mkcmp out/master.minikube out/$(CURRENT_GIT_BRANCH).minikube


.PHONY: help
help:
Expand Down
Loading