bump version to 6.0-2

[pve-installer.git] / Makefile

diff --git a/Makefile b/Makefile
index c4482f4534c9451b8ad92dafa6367d5604399cf6..1ca29720f0be6d201e1b7dc3d64b568ba45ddef9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,7 @@
-PKGVER=5.0
-PKGREL=17
+include /usr/share/dpkg/pkg-info.mk
 
-PVE_DEB=pve-installer_${PKGVER}-${PKGREL}_all.deb
-PMG_DEB=pmg-installer_${PKGVER}-${PKGREL}_all.deb
+PVE_DEB=pve-installer_${DEB_VERSION_UPSTREAM_REVISION}_all.deb
+PMG_DEB=pmg-installer_${DEB_VERSION_UPSTREAM_REVISION}_all.deb
 
 DEBS = ${PVE_DEB} ${PMG_DEB}
 
@@ -29,7 +28,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}
@@ -38,9 +37,6 @@ ${DEBS}: ${INSTALLER_SOURCES} ${HTML_COMMON_SOURCES} ${HTML_SOURCES}
 install: ${INSTALLER_SOURCES} ${HTML_COMMON_SOURCES} ${HTML_SOURCES}
        make -C html-common install
        install -D -m 644 interfaces ${DESTDIR}/etc/network/interfaces
-       mkdir -p ${DESTDIR}/var/lib/dhcp3/
-       ln -s /tmp/resolv.conf.dhclient-new ${DESTDIR}/etc/resolv.conf
-       ln -s /tmp/resolv.conf.dhclient-new ${DESTDIR}/etc/resolv.conf.dhclient-new
        install -D -m 755 fake-start-stop-daemon ${DESTDIR}/var/lib/pve-installer/fake-start-stop-daemon
        install -D -m 755 policy-disable-rc.d ${DESTDIR}/var/lib/pve-installer/policy-disable-rc.d
        install -D -m 644 country.dat ${DESTDIR}/var/lib/pve-installer/country.dat
@@ -51,10 +47,10 @@ install: ${INSTALLER_SOURCES} ${HTML_COMMON_SOURCES} ${HTML_SOURCES}
        install -D -m 644 Xdefaults ${DESTDIR}/.Xdefaults
 
 pmg-banner.png: pmg-banner.svg
-       inkscape $< --export-png=$@
+       rsvg-convert -o $@ $<
 
 pve-banner.png: pve-banner.svg
-       inkscape $< --export-png=$@
+       rsvg-convert -o $@ $<
 
 .phony: upload-pmg
 upload-pmg: ${PMG_DEB}
@@ -62,16 +58,21 @@ upload-pmg: ${PMG_DEB}
 
 .phony: upload-pve
 upload-pve: ${PVE_DEB}
-       tar cf - ${PVE_DEB} | ssh -X repoman@repo.proxmox.com -- upload --product pve --dist stretch
+       tar cf - ${PVE_DEB} | ssh -X repoman@repo.proxmox.com -- upload --product pve --dist buster
 
-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 +81,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 {} ';'