Fix #2009: Recreate hdsize_adj with new hdsize

[pve-installer.git] / Makefile

diff --git a/Makefile b/Makefile
index e04f829e3c37a3501cfff4961efc381aca9d15e8..a805b327f65171711eedfd443de6df4c61067c3d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,17 +1,18 @@
-# achtung: also set release in proxinstall!
-RELEASE=5.0
-
 PKGVER=5.0
-PKGREL=8
+PKGREL=24
 
 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         \
        fake-start-stop-daemon  \
        policy-disable-rc.d     \
        interfaces              \
-       proxlogo.png            \
+       pmg-banner.png          \
+       pve-banner.png          \
        checktime               \
        xinitrc                 \
        Xdefaults               \
@@ -26,11 +27,12 @@ all: ${INSTALLER_SOURCES} ${HTML_COMMON_SOURCES} ${HTML_SOURCES}
 country.dat: country.pl
        ./country.pl > country.dat
 
-deb: ${PVE_DEB}
-${PVE_DEB}: ${INSTALLER_SOURCES} ${HTML_COMMON_SOURCES} ${HTML_SOURCES}
+deb: ${DEBS} 
+${DEBS}: ${INSTALLER_SOURCES} ${HTML_COMMON_SOURCES} ${HTML_SOURCES}
        rsync -a * build
        cd build; dpkg-buildpackage -b -us -uc
        lintian -X man ${PVE_DEB}
+       lintian -X man ${PMG_DEB}
 
 .phony: install
 install: ${INSTALLER_SOURCES} ${HTML_COMMON_SOURCES} ${HTML_SOURCES}
@@ -41,27 +43,42 @@ install: ${INSTALLER_SOURCES} ${HTML_COMMON_SOURCES} ${HTML_SOURCES}
        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 755 country.dat ${DESTDIR}/var/lib/pve-installer/country.dat
+       install -D -m 644 country.dat ${DESTDIR}/var/lib/pve-installer/country.dat
        install -D -m 755 unconfigured.sh ${DESTDIR}/sbin/unconfigured.sh
        install -D -m 755 proxinstall ${DESTDIR}/usr/bin/proxinstall
        install -D -m 755 checktime ${DESTDIR}/usr/bin/checktime
        install -D -m 644 xinitrc ${DESTDIR}/.xinitrc
        install -D -m 644 Xdefaults ${DESTDIR}/.Xdefaults
 
-.phony: upload
-upload: ${PVE_DEB}
+pmg-banner.png: pmg-banner.svg
+       rsvg-convert -o $@ $<
+
+pve-banner.png: pve-banner.svg
+       rsvg-convert -o $@ $<
+
+.phony: upload-pmg
+upload-pmg: ${PMG_DEB}
+       tar cf - ${PMG_DEB} | ssh -X repoman@repo.proxmox.com -- upload --product pmg --dist stretch
+
+.phony: upload-pve
+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
+       truncate -s 2G 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 final.pkglist
        find . -name '*~' -exec rm {} ';'