bump version to 5.0-10

[pve-installer.git] / Makefile

diff --git a/Makefile b/Makefile
index c969620db1acb72f262f0f7f8ceda0b88e754b65..578b436bd0c46cc7933a7d17e5173c524ecce3a6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,10 @@
-# achtung: also set release in proxinstall!
-RELEASE=5.0
+PKGVER=5.0
+PKGREL=10
 
-DEB=pve-installer_5.0-7_all.deb
+PVE_DEB=pve-installer_${PKGVER}-${PKGREL}_all.deb
+PMG_DEB=pmg-installer_${PKGVER}-${PKGREL}_all.deb
+
+DEBS = ${PVE_DEB} ${PMG_DEB}
 
 INSTALLER_SOURCES=             \
        unconfigured.sh         \
@@ -23,11 +26,12 @@ all: ${INSTALLER_SOURCES} ${HTML_COMMON_SOURCES} ${HTML_SOURCES}
 country.dat: country.pl
        ./country.pl > country.dat
 
-deb: ${DEB}
-${DEB}: ${INSTALLER_SOURCES} ${HTML_COMMON_SOURCES} ${HTML_SOURCES} Makefile html/Makefile
+deb: ${DEBS} 
+${DEBS}: ${INSTALLER_SOURCES} ${HTML_COMMON_SOURCES} ${HTML_SOURCES}
        rsync -a * build
        cd build; dpkg-buildpackage -b -us -uc
-       lintian -X man ${DEB}
+       lintian -X man ${PVE_DEB}
+       lintian -X man ${PMG_DEB}
 
 .phony: install
 install: ${INSTALLER_SOURCES} ${HTML_COMMON_SOURCES} ${HTML_SOURCES}
@@ -46,22 +50,24 @@ install: ${INSTALLER_SOURCES} ${HTML_COMMON_SOURCES} ${HTML_SOURCES}
        install -D -m 644 Xdefaults ${DESTDIR}/.Xdefaults
 
 .phony: upload
-upload: ${DEB}
-       tar cf - ${DEB} | ssh repoman@repo.proxmox.com -- upload --product pve --dist stretch
-
-packages: /pve/${RELEASE}/install/pve.files
-       rm -rf packages packages.tmp; mkdir packages.tmp
-       for i in `cat $<`; do install -m 644 $$i  packages.tmp/; done
-       mv packages.tmp packages
+upload: ${PVE_DEB}
+       tar cf - ${PVE_DEB} | ssh -X repoman@repo.proxmox.com -- upload --product pve,pmg --dist stretch
 
 test.img:
        dd if=/dev/zero of=test.img bs=2048 count=1M
 
-check: packages test.img
-       G_SLICE=always-malloc ./proxinstall -t test.img
+check-pve: ${PVE_DEB} test.img
+       rm -rf testdir
+       dpkg -X ${PVE_DEB} testdir
+       G_SLICE=always-malloc perl -I testdir/usr/share/perl5 testdir/usr/bin/proxinstall -t test.img
+
+check-pmg: ${PMG_DEB} test.img
+       rm -rf testdir
+       dpkg -X ${PMG_DEB} testdir
+       G_SLICE=always-malloc perl -I testdir/usr/share/perl5 testdir/usr/bin/proxinstall -t test.img
 
 .phony: clean
 clean:
        make -C html-common clean
-       rm -rf *~ *.deb target build packages packages.tmp test.img pve-final.pkglist *.buildinfo *.changes country.dat
+       rm -rf *~ *.deb target build packages packages.tmp testdir test.img pve-final.pkglist *.buildinfo *.changes country.dat
        find . -name '*~' -exec rm {} ';'