bump version to 7.4-4

[pve-manager-legacy.git] / Makefile

diff --git a/Makefile b/Makefile
index ecae4d888d07b05e56611f1dbae764b45f76f6fe..1d6189b13aae7df052fefbeb23d4d5d61f2141ce 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,31 +1,34 @@
+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 po
+SUBDIRS = aplinfo PVE bin www services configs network-hooks test
 
-ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
-GITVERSION:=$(shell cat .git/refs/heads/master)
+GITVERSION:=$(shell git rev-parse HEAD)
 
-DEB=${PACKAGE}_${VERSION}-${PACKAGERELEASE}_${ARCH}.deb
+# possibly set via debian/rules(.env)
+REPOID?=$(shell git rev-parse --short=8 HEAD)
 
-all: ${SUBDIRS}
+DEB=${PACKAGE}_${VERSION}_${DEB_BUILD_ARCH}.deb
 
-check:
-       ${MAKE} -C bin/test check
+all: ${SUBDIRS}
+       set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i; done
 
-%:
-       set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i $@; done
+.PHONY: check
+check: bin test www
+       ${MAKE} -C bin check
+       ${MAKE} -C test check
+       ${MAKE} -C www check
 
 .PHONY: dinstall
 dinstall: ${DEB}
        dpkg -i ${DEB}
 
-country.dat: country.pl
-       ./country.pl > country.dat
-
 .PHONY: deb
 deb: $(DEB)
 $(DEB):
@@ -33,47 +36,26 @@ $(DEB):
        mkdir 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 ${DEB}
 
 .PHONY: upload
 upload: ${DEB} check
-       ./repoid.pl .git check
-       tar cf - ${DEB} | ssh -X repoman@repo.proxmox.com upload --product pve --dist stretch
-
-#.PHONY: poupload
-#poupload:
-#      rsync po/*.po po/pve-manager.pot pve.proxmox.com:/home/ftp/sources/po-files/
+       # 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 bullseye
 
 .PHONY: install
-install: country.dat vzdump.conf vzdump-hook-script.pl pve-apt.conf mtu bridgevlan bridgevlanport vlan vlan-down
+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 pve-apt.conf ${DESTDIR}/etc/apt/apt.conf.d/75pveconf
-       install -D -m 0644 pve-sources.list ${DESTDIR}/etc/apt/sources.list.d/pve-enterprise.list
-       install -D -m 0644 pve-blacklist.conf ${DESTDIR}/etc/modprobe.d/pve-blacklist.conf
-       install -D -m 0644 vzdump.conf ${DESTDIR}/etc/vzdump.conf
-       install -D -m 0755 mtu ${DESTDIR}/etc/network/if-up.d/mtu
-       install -D -m 0755 bridgevlan ${DESTDIR}/etc/network/if-up.d/bridgevlan
-       install -D -m 0755 bridgevlanport ${DESTDIR}/etc/network/if-up.d/bridgevlanport
-       install -D -m 0755 vlan ${DESTDIR}/etc/network/if-pre-up.d/vlan
-       install -D -m 0755 vlan-down ${DESTDIR}/etc/network/if-post-down.d/vlan
-
-       install -D -m 0644 pve-initramfs.conf ${DESTDIR}/etc/initramfs-tools/conf.d/pve-initramfs.conf
-
        install -m 0644 vzdump-hook-script.pl ${DOCDIR}/examples/vzdump-hook-script.pl
        install -m 0644 spice-example-sh ${DOCDIR}/examples/spice-example-sh
-       install -m 0644 country.dat ${DESTDIR}/usr/share/${PACKAGE}
-
        set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i $@; done
 
 .PHONY: distclean