buildsys: use dpkg-architecture

[pve-firewall.git] / Makefile

diff --git a/Makefile b/Makefile
index a789d92b26059f781b271e51a8fcbe8b7286931d..cbd841080de9d998bff05165590383560b774bec 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,5 @@
-RELEASE=4.0
-
 VERSION=2.0
-PKGREL=8
+PKGREL=33
 
 PACKAGE=pve-firewall
 
@@ -13,7 +11,7 @@ DOCDIR=${PREFIX}/share/doc
 MAN1DIR=${MANDIR}/man1/
 PERLDIR=${PREFIX}/share/perl5
 
-ARCH=amd64
+ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 GITVERSION:=$(shell cat .git/refs/heads/master)
 
 DEB=${PACKAGE}_${VERSION}-${PKGREL}_${ARCH}.deb
@@ -26,7 +24,8 @@ dinstall: deb
 
 
 .PHONY: deb
-deb ${DEB}: check
+deb: ${DEB}
+${DEB}: check
        rm -rf build
        rsync -a src/ build
        rsync -a debian/ build/debian
@@ -51,10 +50,4 @@ distclean: clean
 
 .PHONY: upload
 upload: ${DEB}
-       umount /pve/${RELEASE}; mount /pve/${RELEASE} -o rw 
-       mkdir -p /pve/${RELEASE}/extra
-       rm -f /pve/${RELEASE}/extra/${PACKAGE}_*.deb
-       rm -f /pve/${RELEASE}/extra/Packages*
-       cp ${DEB} /pve/${RELEASE}/extra
-       cd /pve/${RELEASE}/extra; dpkg-scanpackages . /dev/null > Packages; gzip -9c Packages > Packages.gz
-       umount /pve/${RELEASE}; mount /pve/${RELEASE} -o ro
+       tar cf - ${DEB} | ssh repoman@repo.proxmox.com upload