X-Git-Url: https://git.proxmox.com/?p=pve-firewall.git;a=blobdiff_plain;f=Makefile;h=9cd78913f47fe80f07e95b6b87824317d3e8854f;hp=b89ebceb130e60caf526e9337ebf19d0c0009bdc;hb=05018f6e8b9b8cc8ea74425f2d59c57f6d81b469;hpb=609f00c71829d4d37c0552863bcb156634999f11

diff --git a/Makefile b/Makefile
index b89ebce..9cd7891 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,5 @@
-RELEASE=3.3
-
-VERSION=1.0
-PKGREL=18
+VERSION=3.0
+PKGREL=17
 
 PACKAGE=pve-firewall
 
@@ -13,27 +11,32 @@ DOCDIR=${PREFIX}/share/doc
 MAN1DIR=${MANDIR}/man1/
 PERLDIR=${PREFIX}/share/perl5
 
-ARCH=amd64
-GITVERSION:=$(shell cat .git/refs/heads/master)
+ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
+GITVERSION:=$(shell git rev-parse HEAD)
 
 DEB=${PACKAGE}_${VERSION}-${PKGREL}_${ARCH}.deb
+DEB2=${PACKAGE}-dbgsym_${VERSION}-${PKGREL}_${ARCH}.deb
+DEBS=$(DEB) $(DEB2)
 
-all: ${DEB}
+all: $(DEBS)
 
 .PHONY: dinstall
 dinstall: deb
-	dpkg -i ${DEB}
+	dpkg -i $(DEBS)
 
 
 .PHONY: deb
-deb ${DEB}: check
+deb: $(DEBS)
+$(DEB2): $(DEB)
+$(DEB): src test debian
+	make check
 	rm -rf build
 	rsync -a src/ build
 	rsync -a debian/ build/debian
 	echo "git clone git://git.proxmox.com/git/pve-firewall.git\\ngit checkout ${GITVERSION}" > build/debian/SOURCE
 	# install
-	cd build; dpkg-buildpackage -rfakeroot -b -us -uc
-	lintian ${DEB}
+	cd build; dpkg-buildpackage -b -us -uc
+	lintian ${DEBS}
 
 .PHONY: check
 check: 
@@ -43,18 +46,12 @@ check:
 clean: 	
 	make -C src clean
 	make -C test clean
-	rm -rf *~ debian/*~ example/*~ *.deb *.changes build ${PACKAGE}-*.tar.gz
+	rm -rf *~ debian/*~ example/*~ *.deb *.changes *.buildinfo build ${PACKAGE}-*.tar.gz
 
 .PHONY: distclean
 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
+upload: $(DEBS)
+	tar cf - $(DEBS) | ssh repoman@repo.proxmox.com -- upload --product pve --dist stretch --arch ${ARCH}