cherry-pick stable fixes for 7.2

[pve-qemu.git] / Makefile

diff --git a/Makefile b/Makefile
index 93301b1f4748f0984ace246618f91bc2d72d39be..8be47218ffab1a4f66eebeb4bd8a941562b91ad8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -16,17 +16,18 @@ all: $(DEBS)
 
 .PHONY: submodule
 submodule:
-       test -f "${SRCDIR}/debian/changelog" || git submodule update --init
+       test -f "${SRCDIR}/configure" || git submodule update --init --recursive
 
 $(BUILDDIR): keycodemapdb | 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 $(BUILDDIR)
        cp -a $(SRCDIR) $(BUILDDIR)
        cp -a debian $(BUILDDIR)/debian
        rm -rf $(BUILDDIR)/ui/keycodemapdb
        cp -a keycodemapdb $(BUILDDIR)/ui/
        echo "git clone git://git.proxmox.com/git/pve-qemu.git\\ngit checkout $(GITVERSION)" > $(BUILDDIR)/debian/SOURCE
-       # set package version
-       sed -i 's/^pkgversion="".*/pkgversion="${PACKAGE}_${KVMVER}-${KVMPKGREL}"/' $(BUILDDIR)/configure
 
 .PHONY: deb kvm
 deb kvm: $(DEBS)
@@ -48,7 +49,7 @@ update:
 
 .PHONY: upload
 upload: $(DEBS)
-       tar cf - ${DEBS} | ssh repoman@repo.proxmox.com upload --product pve --dist buster
+       tar cf - ${DEBS} | ssh repoman@repo.proxmox.com upload --product pve --dist bullseye
 
 .PHONY: distclean clean
 distclean: clean