bump version to 9.0.0-2

[pve-qemu.git] / Makefile

diff --git a/Makefile b/Makefile
index e389a9c5cae31837e25d85bdde8f4b6a3bde932e..f23b041616775e7b7b9ba07d57352b25945e70b9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -24,6 +24,7 @@ endif
 
 PC_BIOS_FW_PURGE_LIST_IN = \
        hppa-firmware.img \
+       hppa-firmware64.img \
        openbios-ppc \
        openbios-sparc32 \
        openbios-sparc64 \
@@ -31,7 +32,8 @@ PC_BIOS_FW_PURGE_LIST_IN = \
        s390-ccw.img \
        s390-netboot.img \
        u-boot.e500 \
-       .*\.dtb \
+       .*[a-zA-Z0-9]\.dtb \
+       .*[a-zA-Z0-9]\.dts \
        qemu_vga.ndrv \
        slof.bin \
        opensbi-riscv.*-generic-fw_dynamic.bin \
@@ -39,16 +41,14 @@ PC_BIOS_FW_PURGE_LIST_IN = \
 BLOB_PURGE_SED_CMDS = $(foreach FILE,$(PC_BIOS_FW_PURGE_LIST_IN),-e "/$(FILE)/d")
 BLOB_PURGE_FILTER = $(foreach FILE,$(PC_BIOS_FW_PURGE_LIST_IN),-e "$(FILE)")
 
-$(BUILDDIR): keycodemapdb | submodule
+$(BUILDDIR): submodule
        # check if qemu/ was used for a build
        # if so, please run 'make distclean' in the submodule and try again
        test ! -f $(SRCDIR)/build/config.status
        rm -rf $@.tmp $@
        cp -a $(SRCDIR) $@.tmp
        cp -a debian $@.tmp/debian
-       rm -rf $@.tmp/ui/keycodemapdb
        rm -rf $@.tmp/roms/edk2 # packaged separately
-       cp -a keycodemapdb $@.tmp/ui/
        find $@.tmp/pc-bios -type f | grep $(BLOB_PURGE_FILTER) | xargs rm -f
        sed -i $(BLOB_PURGE_SED_CMDS) $@.tmp/pc-bios/meson.build
        echo "git clone git://git.proxmox.com/git/pve-qemu.git\\ngit checkout $(GITVERSION)" > $@.tmp/debian/SOURCE
@@ -58,7 +58,7 @@ $(BUILDDIR): keycodemapdb | submodule
 deb kvm: $(DEBS)
 $(DEB_DBG): $(DEB)
 $(DEB): $(BUILDDIR)
-       cd $(BUILDDIR); dpkg-buildpackage -b -us -uc -j
+       cd $(BUILDDIR); dpkg-buildpackage -b -us -uc
        lintian $(DEBS)
 
 sbuild: $(DSC)
@@ -76,17 +76,6 @@ dsc:
 $(DSC): $(ORIG_SRC_TAR) $(BUILDDIR)
        cd $(BUILDDIR); dpkg-buildpackage -S -us -uc -d
 
-.PHONY: update
-update:
-       cd $(SRCDIR) && git submodule deinit ui/keycodemapdb || true
-       rm -rf $(SRCDIR)/ui/keycodemapdb
-       mkdir $(SRCDIR)/ui/keycodemapdb
-       cd $(SRCDIR) && git submodule update --init ui/keycodemapdb
-       rm -rf keycodemapdb
-       mkdir keycodemapdb
-       cp -R $(SRCDIR)/ui/keycodemapdb/* keycodemapdb/
-       git add keycodemapdb
-
 .PHONY: upload
 upload: UPLOAD_DIST ?= $(DEB_DISTRIBUTION)
 upload: $(DEBS)