tests: cfg2cmd: get testname earlier

[qemu-server.git] / Makefile

diff --git a/Makefile b/Makefile
index 7445cb678e8c22a82db852e8e2e14371f5d9e205..457eaef4df57215619bc361d5a3832443fe510c8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -21,6 +21,7 @@ GITVERSION:=$(shell git rev-parse HEAD)
 
 DEB=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}_${DEB_BUILD_ARCH}.deb
 DBG_DEB=${PACKAGE}-dbgsym_${DEB_VERSION_UPSTREAM_REVISION}_${DEB_BUILD_ARCH}.deb
+DSC=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}.dsc
 
 DEBS=${DEB} ${DBG_DEB}
 
@@ -51,7 +52,7 @@ qmrestore.zsh-completion:
        mv $@.tmp $@
 
 PKGSOURCES=qm qm.1 qmrestore qmrestore.1 qmextract qm.conf.5 qm.bash-completion qmrestore.bash-completion \
-           qm.zsh-completion qmrestore.zsh-completion
+           qm.zsh-completion qmrestore.zsh-completion cpu-models.conf.5
 
 .PHONY: install
 install: ${PKGSOURCES}
@@ -75,6 +76,7 @@ install: ${PKGSOURCES}
        install -m 0755 qmextract ${DESTDIR}${LIBDIR}
        install -m 0644 qm.1 ${DESTDIR}/${MAN1DIR}
        install -m 0644 qmrestore.1 ${DESTDIR}/${MAN1DIR}
+       install -m 0644 cpu-models.conf.5 ${DESTDIR}/${MAN5DIR}
        install -m 0644 qm.conf.5 ${DESTDIR}/${MAN5DIR}
        cd ${DESTDIR}/${MAN5DIR}; ln -s -f qm.conf.5.gz vm.conf.5.gz
 
@@ -90,6 +92,12 @@ ${DEB}: $(BUILDDIR)
        cd $(BUILDDIR); dpkg-buildpackage -b -us -uc
        lintian ${DEBS}
 
+.PHONY: dsc
+dsc: ${DSC}
+${DSC}: ${BUILDDIR}
+       cd ${BUILDDIR}; dpkg-buildpackage -S -us -uc -d
+       lintian ${DSC}
+
 .PHONY: test
 test:
        PVE_GENERATING_DOCS=1 perl -I. ./qm verifyapi
@@ -97,12 +105,12 @@ test:
 
 .PHONY: upload
 upload: ${DEB}
-       tar cf - ${DEBS} | ssh repoman@repo.proxmox.com upload --product pve --dist buster
+       tar cf - ${DEBS} | ssh -X repoman@repo.proxmox.com upload --product pve --dist buster
 
 .PHONY: clean
 clean:
+       rm -rf $(PACKAGE)-*/ *.deb *.buildinfo *.changes *.dsc $(PACKAGE)_*.tar.gz
        $(MAKE) cleanup-docgen
-       rm -rf $(PACKAGE)-*/ *.deb *.buildinfo *.changes
        find . -name '*~' -exec rm {} ';'