bump version to 7.4-4

[pve-manager-legacy.git] / Makefile

diff --git a/Makefile b/Makefile
index 8d462915e3db552dd162b670d6d499751a15cd56..1d6189b13aae7df052fefbeb23d4d5d61f2141ce 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,24 +1,29 @@
+include /usr/share/dpkg/pkg-info.mk
+include /usr/share/dpkg/architecture.mk
 include defines.mk
 
-export SOURCE_DATE_EPOCH ?= $(shell dpkg-parsechangelog -STimestamp)
+export PVERELEASE=${DEB_VERSION_UPSTREAM}
+export VERSION=${DEB_VERSION_UPSTREAM_REVISION}
 
 DESTDIR=
 
 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
+DEB=${PACKAGE}_${VERSION}_${DEB_BUILD_ARCH}.deb
 
 all: ${SUBDIRS}
        set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i; done
 
-check:
+.PHONY: check
+check: bin test www
+       ${MAKE} -C bin check
        ${MAKE} -C test check
+       ${MAKE} -C www check
 
 .PHONY: dinstall
 dinstall: ${DEB}
@@ -33,14 +38,13 @@ $(DEB):
        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 ${DEB}
 
 .PHONY: upload
 upload: ${DEB} check
        # 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
+       tar cf - ${DEB} | ssh -X repoman@repo.proxmox.com upload --product pve --dist bullseye
 
 .PHONY: install
 install: vzdump-hook-script.pl
@@ -50,7 +54,6 @@ install: vzdump-hook-script.pl
        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 -m 0644 vzdump-hook-script.pl ${DOCDIR}/examples/vzdump-hook-script.pl
        install -m 0644 spice-example-sh ${DOCDIR}/examples/spice-example-sh
        set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i $@; done