bump version to 5.1-3

[pve-manager.git] / Makefile

diff --git a/Makefile b/Makefile
index 92cba4f456d9a87e74984d02bf94e0db9023da0b..3471f009081ae3ba06667896433641632cb5391c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,101 +1,67 @@
 include defines.mk
 
+export SOURCE_DATE_EPOCH ?= $(shell dpkg-parsechangelog -STimestamp)
+
 DESTDIR=
 
-#SUBDIRS = bin lib www aplinfo
-SUBDIRS = aplinfo PVE bin www po
+SUBDIRS = aplinfo PVE bin www services configs network-hooks test
 
 ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
+GITVERSION:=$(shell git rev-parse HEAD)
+
+# possibly set via debian/rules(.env)
+REPOID?=$(shell git rev-parse --short=8 HEAD)
 
 DEB=${PACKAGE}_${VERSION}-${PACKAGERELEASE}_${ARCH}.deb
 
 all: ${SUBDIRS}
+       set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i; done
 
-check:
-       ${MAKE} -C bin/test check
-
-%:
-       set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i $@; done
-
+.PHONY: check
+check: bin test
+       ${MAKE} -C bin check
+       ${MAKE} -C test check
 
 .PHONY: dinstall
 dinstall: ${DEB}
        dpkg -i ${DEB}
 
-country.dat: country.pl
-       ./country.pl > country.dat
-
-.PHONY: ${DEB}
-${DEB} deb:
-       make clean
+.PHONY: deb
+deb: $(DEB)
+$(DEB):
        rm -rf dest
        mkdir dest
-       make DESTDIR=`pwd`/dest install
-       mkdir dest/DEBIAN
-       sed -e s/@VERSION@/${VERSION}/ -e s/@PACKAGE@/${PACKAGE}/ -e s/@PACKAGERELEASE@/${PACKAGERELEASE}/ debian/control.in >dest/DEBIAN/control
-       install -m 0644 debian/conffiles dest/DEBIAN
-       install -m 0755 debian/config dest/DEBIAN
-       install -m 0644 debian/templates dest/DEBIAN
-       install -m 0755 debian/postinst dest/DEBIAN
-       install -m 0755 debian/prerm dest/DEBIAN
-       install -m 0755 debian/postrm dest/DEBIAN
-       install -m 0644 debian/triggers dest/DEBIAN
-       gzip --best dest/usr/share/man/*/*
-       gzip --best dest/usr/share/doc/${PACKAGE}/changelog.Debian
-       dpkg-deb --build dest
-       mv dest.deb ${DEB}
-       rm -rf dest
+       rsync -a * dest
+       echo "git clone git://git.proxmox.com/git/pve-manager.git\\ngit checkout ${GITVERSION}" >  dest/debian/SOURCE
+       echo "REPOID_GENERATED=${REPOID}" > dest/debian/rules.env
+       cd dest; dpkg-buildpackage -b -us -uc
        # supress lintian error: statically-linked-binary usr/bin/pvemailforward
-       lintian -X binaries ${DEB}      
+       lintian -X binaries ${DEB}
 
 .PHONY: upload
 upload: ${DEB} check
-       ./repoid.pl .git check
-       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
-
-#.PHONY: poupload
-#poupload:
-#      rsync po/*.po po/pve-manager.pot pve.proxmox.com:/home/ftp/sources/po-files/
-
-.PHONY: aplupload
-aplupload:
-       ./aplinfo/apltest.pl
-       gpg -bas -u support@proxmox.com aplinfo/aplinfo.dat
-       gzip -c aplinfo/aplinfo.dat > aplinfo.dat.gz
-       scp aplinfo/aplinfo.dat aplinfo.dat.gz aplinfo/aplinfo.dat.asc download1.proxmox.com:/home/ftp/appliances/
+       # check if working directory is clean
+       git diff --exit-code --stat && git diff --exit-code --stat --staged
+       tar cf - ${DEB} | ssh -X repoman@repo.proxmox.com upload --product pve --dist stretch
 
 .PHONY: install
-install: country.dat vznet.conf vzdump.conf vzdump-hook-script.pl
+install: vzdump-hook-script.pl
        install -d -m 0700 -o www-data -g www-data ${DESTDIR}/var/log/pveproxy
-       install -D -m 0644 debian/pve.logrotate ${DESTDIR}/etc/logrotate.d/pve
-       install -d ${DESTDIR}/usr/share/${PACKAGE}
-       install -d ${DESTDIR}/usr/share/man/man1
        install -d ${DOCDIR}/examples
        install -d ${DESTDIR}/var/lib/${PACKAGE}
        install -d ${DESTDIR}/var/lib/vz/images
        install -d ${DESTDIR}/var/lib/vz/template/cache
        install -d ${DESTDIR}/var/lib/vz/template/iso
        install -d ${DESTDIR}/var/lib/vz/template/qemu
-       install -D -m 0644 vzdump.conf ${DESTDIR}/etc/vzdump.conf
-       install -D -m 0755 vznet.conf ${DESTDIR}/etc/vz/vznet.conf
        install -m 0644 vzdump-hook-script.pl ${DOCDIR}/examples/vzdump-hook-script.pl
-       install -m 0644 copyright ${DOCDIR}
-       install -m 0644 debian/changelog.Debian ${DOCDIR}
-       install -m 0644 country.dat ${DESTDIR}/usr/share/${PACKAGE}
+       install -m 0644 spice-example-sh ${DOCDIR}/examples/spice-example-sh
        set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i $@; done
 
 .PHONY: distclean
 distclean: clean
-       set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i $@; done
 
 .PHONY: clean
 clean:
        set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i $@; done
        find . -name '*~' -exec rm {} ';'
-       rm -rf dest country.dat *.deb
+       rm -rf dest country.dat *.deb *.buildinfo *.changes ca-tmp