From 39da4432c76c73c17eb89b292263a60d133bb08b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= Date: Mon, 3 Feb 2020 22:15:02 +0100 Subject: [PATCH] Fix building packages for architectures Missed a suffix, and the rpm architecture names --- Makefile | 8 +++++++- .../rpm/kvm2_rpm_template/docker-machine-driver-kvm2.spec | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 6a17726cf6..9e29595a8c 100755 --- a/Makefile +++ b/Makefile @@ -534,6 +534,12 @@ release-minikube: out/minikube checksum ## Minikube release out/docker-machine-driver-kvm2: out/docker-machine-driver-kvm2-amd64 cp $< $@ +out/docker-machine-driver-kvm2-x86_64: out/docker-machine-driver-kvm2-amd64 + cp $< $@ + +out/docker-machine-driver-kvm2-aarch64: out/docker-machine-driver-kvm2-arm64 + cp $< $@ + out/docker-machine-driver-kvm2-%: ifeq ($(MINIKUBE_BUILD_IN_DOCKER),y) docker inspect -f '{{.Id}} {{.RepoTags}}' $(KVM_BUILD_IMAGE) || $(MAKE) kvm-image @@ -560,7 +566,7 @@ out/docker-machine-driver-kvm2_$(DEB_VERSION)-0_%.deb: out/docker-machine-driver sed -E -i 's/--VERSION--/'$(DEB_VERSION)'/g' out/docker-machine-driver-kvm2_$(DEB_VERSION)/DEBIAN/control sed -E -i 's/--ARCH--/'$*'/g' out/docker-machine-driver-kvm2_$(DEB_VERSION)/DEBIAN/control mkdir -p out/docker-machine-driver-kvm2_$(DEB_VERSION)/usr/bin - cp out/docker-machine-driver-kvm2 out/docker-machine-driver-kvm2_$(DEB_VERSION)/usr/bin/docker-machine-driver-kvm2 + cp $< out/docker-machine-driver-kvm2_$(DEB_VERSION)/usr/bin/docker-machine-driver-kvm2 fakeroot dpkg-deb --build out/docker-machine-driver-kvm2_$(DEB_VERSION) $@ rm -rf out/docker-machine-driver-kvm2_$(DEB_VERSION) diff --git a/installers/linux/rpm/kvm2_rpm_template/docker-machine-driver-kvm2.spec b/installers/linux/rpm/kvm2_rpm_template/docker-machine-driver-kvm2.spec index 372e7e18cc..ec309ffb66 100644 --- a/installers/linux/rpm/kvm2_rpm_template/docker-machine-driver-kvm2.spec +++ b/installers/linux/rpm/kvm2_rpm_template/docker-machine-driver-kvm2.spec @@ -18,7 +18,7 @@ a consistent way to manage various VM providers. %prep mkdir -p %{name}-%{version} cd %{name}-%{version} -cp --OUT--/docker-machine-driver-kvm2 . +cp --OUT--/docker-machine-driver-kvm2-%{_arch} docker-machine-driver-kvm2 %install cd %{name}-%{version}