X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Makefile;h=7b9f539806cec31dfc85c49968c301a9040bd597;hb=32f749b840edfc0d0d7e5dd6f87b4a389a795665;hp=7d708dc90496e2b29060723a4761d0f6b8c8b38f;hpb=a121b2ec7f89d8f8b345748a12ed24e98c28ac0d;p=pve-storage.git

diff --git a/Makefile b/Makefile
index 7d708dc..7b9f539 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,6 @@
-RELEASE=4.2
-
-VERSION=4.0
+VERSION=5.0
 PACKAGE=libpve-storage-perl
-PKGREL=58
+PKGREL=30
 
 DESTDIR=
 PREFIX=/usr
@@ -15,9 +13,10 @@ BASHCOMPLDIR=${PREFIX}/share/bash-completion/completions/
 
 export PERLDIR=${PREFIX}/share/perl5
 
-#ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
+export SOURCE_DATE_EPOCH ?= $(shell dpkg-parsechangelog -STimestamp)
+
 ARCH=all
-GITVERSION:=$(shell cat .git/refs/heads/master)
+GITVERSION:=$(shell git rev-parse HEAD)
 
 DEB=${PACKAGE}_${VERSION}-${PKGREL}_${ARCH}.deb
 
@@ -25,7 +24,7 @@ DEB=${PACKAGE}_${VERSION}-${PKGREL}_${ARCH}.deb
 export NOVIEW=1
 include /usr/share/pve-doc-generator/pve-doc-generator.mk
 
-all: ${DEB}
+all:
 
 .PHONY: dinstall
 dinstall: deb
@@ -36,37 +35,33 @@ pvesm.bash-completion:
 	mv $@.tmp $@
 
 .PHONY: install
-install: pvesm.1 pvesm.bash-completion
+install: PVE pvesm.1 pvesm.bash-completion
 	install -d ${DESTDIR}${SBINDIR}
 	install -m 0755 pvesm ${DESTDIR}${SBINDIR}
 	make -C PVE install
 	install -d ${DESTDIR}/usr/share/man/man1
 	install -m 0644 pvesm.1 ${DESTDIR}/usr/share/man/man1/
-	gzip -9 ${DESTDIR}/usr/share/man/man1/pvesm.1
+	gzip -9 -n ${DESTDIR}/usr/share/man/man1/pvesm.1
 	install -m 0644 -D pvesm.bash-completion ${DESTDIR}${BASHCOMPLDIR}/pvesm
 
-.PHONY: deb ${DEB}
-deb ${DEB}:
-	rm -rf debian
-	mkdir debian
-	make DESTDIR=${CURDIR}/debian install
-	perl -I. -T -e "use PVE::CLI::pvesm; PVE::CLI::pvesm->verify_api();"
-	install -d -m 0755 debian/DEBIAN
-	sed -e s/@@VERSION@@/${VERSION}/ -e s/@@PKGRELEASE@@/${PKGREL}/ -e s/@@ARCH@@/${ARCH}/ <control.in >debian/DEBIAN/control
-	install -D -m 0644 copyright debian/${DOCDIR}/copyright
-	install -m 0644 changelog.Debian debian/${DOCDIR}/
-	install -m 0644 triggers debian/DEBIAN
-	gzip -9 debian/${DOCDIR}/changelog.Debian
-	echo "git clone git://git.proxmox.com/git/pve-storage.git\\ngit checkout ${GITVERSION}" > debian/${DOCDIR}/SOURCE
-	dpkg-deb --build debian	
-	mv debian.deb ${DEB}
-	rm -rf debian
+.PHONY: deb
+deb: ${DEB}
+${DEB}:
+	rm -rf build
+	rsync -a * build
+	echo "git clone git://git.proxmox.com/git/pve-storage.git\\ngit checkout ${GITVERSION}" >build/debian/SOURCE
+	cd build; dpkg-buildpackage -b -us -uc
 	lintian ${DEB}
 
+.PHONY: test
+test:
+	perl -I. -T -e "use PVE::CLI::pvesm; PVE::CLI::pvesm->verify_api();"
+	make -C test
+
 .PHONY: clean
 clean:
 	make cleanup-docgen
-	rm -rf debian *.deb ${PACKAGE}-*.tar.gz dist *.1 *.tmp pvesm.bash-completion
+	rm -rf build *.deb *.buildinfo *.changes
 	find . -name '*~' -exec rm {} ';'
 
 .PHONY: distclean
@@ -75,11 +70,5 @@ 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 --product pve --dist stretch