From 24311984e88867a26f6522974be31934e40ba971 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Fri, 27 Sep 2019 15:28:30 +0200 Subject: [PATCH] Makefile: Fix image-customize call for multiple rpms Ensure that we only install the current rpm into the VM. If there are older ones in the build tree, image-customize otherwise fails. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 1f6afca..061ce0c 100644 --- a/Makefile +++ b/Makefile @@ -123,7 +123,7 @@ rpm: dist-gzip cockpit-$(PACKAGE_NAME).spec # build a VM with locally built rpm installed $(VM_IMAGE): rpm bots rm -f $(VM_IMAGE) $(VM_IMAGE).qcow2 - bots/image-customize -v -i cockpit -i `pwd`/cockpit-$(PACKAGE_NAME)-*.noarch.rpm -s $(CURDIR)/test/vm.install $(TEST_OS) + bots/image-customize -v -i cockpit -i `pwd`/cockpit-$(PACKAGE_NAME)-*$(VERSION)*.noarch.rpm -s $(CURDIR)/test/vm.install $(TEST_OS) # convenience target for the above vm: $(VM_IMAGE)