minor style fixes

[pve-installer.git] / Makefile

diff --git a/Makefile b/Makefile
index d5e76b6db21c467b5602fe2618086ac3b42cf95e..c72df6cadda5d28a9845bfc33b74a5aeefbf641f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 PKGVER=5.0
-PKGREL=22
+PKGREL=24
 
 PVE_DEB=pve-installer_${PKGVER}-${PKGREL}_all.deb
 PMG_DEB=pmg-installer_${PKGVER}-${PKGREL}_all.deb
@@ -29,7 +29,7 @@ country.dat: country.pl
 
 deb: ${DEBS} 
 ${DEBS}: ${INSTALLER_SOURCES} ${HTML_COMMON_SOURCES} ${HTML_SOURCES}
-       rsync -a * build
+       rsync --exclude='test*.img' -a * build
        cd build; dpkg-buildpackage -b -us -uc
        lintian -X man ${PVE_DEB}
        lintian -X man ${PMG_DEB}
@@ -64,14 +64,19 @@ upload-pmg: ${PMG_DEB}
 upload-pve: ${PVE_DEB}
        tar cf - ${PVE_DEB} | ssh -X repoman@repo.proxmox.com -- upload --product pve --dist stretch
 
-test.img:
-       dd if=/dev/zero of=test.img bs=2048 count=1M
+%.img:
+       truncate -s 2G $@
 
 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-pve-multidisks: ${PVE_DEB} test.img test2.img test3.img test4.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,test2.img,test3.img,test4.img
+
 check-pmg: ${PMG_DEB} test.img
        rm -rf testdir
        dpkg -X ${PMG_DEB} testdir
@@ -80,5 +85,5 @@ check-pmg: ${PMG_DEB} test.img
 .phony: clean
 clean:
        make -C html-common clean
-       rm -rf *~ *.deb target build packages packages.tmp testdir test.img pve-final.pkglist *.buildinfo *.changes country.dat final.pkglist
+       rm -rf *~ *.deb target build packages packages.tmp testdir test*.img pve-final.pkglist *.buildinfo *.changes country.dat final.pkglist
        find . -name '*~' -exec rm {} ';'