make: fix upload target

[pve-cluster.git] / Makefile

diff --git a/Makefile b/Makefile
index c95cf9d1986088f7fad1ecb2d147ad2a9be13ae0..6adbdb4dd4deed3bd6ea774a7c05e4feceed4b76 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,14 @@
-PACKAGE=pve-cluster
-PKGVER=4.0
-PKGREL=48
+include /usr/share/dpkg/pkg-info.mk
+include /usr/share/dpkg/architecture.mk
 
-ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
-GITVERSION:=$(shell cat .git/refs/heads/master)
+PACKAGE=pve-cluster
 
-DEB=${PACKAGE}_${PKGVER}-${PKGREL}_${ARCH}.deb
-DBG_DEB=${PACKAGE}-dbg_${PKGVER}-${PKGREL}_${ARCH}.deb
+GITVERSION:=$(shell git rev-parse HEAD)
 
+DEB=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}_${DEB_BUILD_ARCH}.deb
+DBGDEB=${PACKAGE}-dbgsym_${DEB_VERSION_UPSTREAM_REVISION}_${DEB_BUILD_ARCH}.deb
 
+PERL_APIVER := `perl -MConfig -e 'print $$Config{debian_abi}//$$Config{version};'`
 
 all: ${DEB} ${DBG_DEB}
 
@@ -20,21 +20,21 @@ dinstall: ${DEB}
        dpkg -i ${DEB} 
 
 .PHONY: deb
-deb ${DEB} ${DBG_DEB}:
+deb ${DBG_DEB}: ${DEB}
+${DEB}:
        rm -f *.deb
        rm -rf build
-       rsync -a --exclude .svn data/ build
+       cp -a data build
        cp -a debian build/debian
        echo "git clone git://git.proxmox.com/git/pve-cluster.git\\ngit checkout ${GITVERSION}" > build/debian/SOURCE
-       cd build; ./autogen.sh
        cd build; dpkg-buildpackage -rfakeroot -b -us -uc
        lintian ${DEB}
 
 
 .PHONY: upload
 upload: ${DEB} ${DBG_DEB}
-       tar cf - ${DEB} ${DBG_DEB}| ssh repoman@repo.proxmox.com upload
+       tar cf - ${DEB} ${DBGDEB}| ssh -X repoman@repo.proxmox.com -- upload --product pve --dist buster --arch ${DEB_BUILD_ARCH}
 
 .PHONY: clean
 clean:
-       rm -rf *~ build *_${ARCH}.deb *.changes *.dsc ${CSDIR}
+       rm -rf *~ build *.deb *.changes *.dsc ${CSDIR} *.buildinfo