From ef54dc181b3c656fe5b4576cfd83962048f8f475 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Tue, 3 Mar 2020 19:41:16 +0100 Subject: [PATCH] Makefile: Drop hack for fixed kernel bug We have never observed https://bugzilla.redhat.com/show_bug.cgi?id=1762663 in Fedora 32, and it does not seem to happen with current Fedora 31 any more either. Closes #329 --- Makefile | 3 --- 1 file changed, 3 deletions(-) diff --git a/Makefile b/Makefile index 8c4076b56..3d26a061e 100644 --- a/Makefile +++ b/Makefile @@ -141,10 +141,7 @@ rpm: dist-gzip $(RPM_NAME).spec # build a VM with locally built rpm installed $(VM_IMAGE): rpm bots rm -f $(VM_IMAGE) $(VM_IMAGE).qcow2 - # HACK: https://bugzilla.redhat.com/show_bug.cgi?id=1762663 - if [ $(TEST_OS) = "fedora-31" ]; then bots/image-customize -v -r 'grub2-editenv - set "$$(grub2-editenv list | grep ^kernelopts) debug"' $(TEST_OS); fi bots/image-customize -v -i cockpit-ws -i `pwd`/$(RPM_NAME)-*.noarch.rpm -s $(CURDIR)/test/vm.install $(TEST_OS) - if [ $(TEST_OS) = "fedora-31" ]; then bots/image-customize -v -r 'grub2-editenv - set "$$(grub2-editenv list | grep ^kernelopts | sed "s/debug//")"' $(TEST_OS); fi # convenience target for the above vm: $(VM_IMAGE)