fix product names according to branding guideline

[pve-installer.git] / Makefile

diff --git a/Makefile b/Makefile
index dfbbb204fdb94adc7e07c3078b7074f5e96eb30a..e232f7f544fc56366e47e0bd04b16fe29fcc9de0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,17 +1,18 @@
-PKGVER=5.0
-PKGREL=12
+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
+PBS_DEB=pbs-installer_${DEB_VERSION_UPSTREAM_REVISION}_all.deb
 
-DEBS = ${PVE_DEB} ${PMG_DEB}
+DEBS = ${PVE_DEB} ${PMG_DEB} ${PBS_DEB}
 
 INSTALLER_SOURCES=             \
        unconfigured.sh         \
        fake-start-stop-daemon  \
-       policy-disable-rc.d     \
        interfaces              \
-       proxlogo.png            \
+       pmg-banner.png          \
+       pve-banner.png          \
+       pbs-banner.png          \
        checktime               \
        xinitrc                 \
        Xdefaults               \
@@ -26,22 +27,19 @@ all: ${INSTALLER_SOURCES} ${HTML_COMMON_SOURCES} ${HTML_SOURCES}
 country.dat: country.pl
        ./country.pl > country.dat
 
-deb: ${DEBS} 
+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}
+       lintian -X man ${PBS_DEB}
 
 .phony: install
 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
        install -D -m 755 unconfigured.sh ${DESTDIR}/sbin/unconfigured.sh
        install -D -m 755 proxinstall ${DESTDIR}/usr/bin/proxinstall
@@ -49,29 +47,54 @@ install: ${INSTALLER_SOURCES} ${HTML_COMMON_SOURCES} ${HTML_SOURCES}
        install -D -m 644 xinitrc ${DESTDIR}/.xinitrc
        install -D -m 644 Xdefaults ${DESTDIR}/.Xdefaults
 
+pmg-banner.png: pmg-banner.svg
+       rsvg-convert -o $@ $<
+
+pve-banner.png: pve-banner.svg
+       rsvg-convert -o $@ $<
+
+pbs-banner.png: pbs-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
+       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
+       umount -Rd testdir || true
        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
+       umount -Rd testdir || true
+       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
+       umount -Rd testdir || true
        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
 
+check-pbs: ${PBS_DEB} test.img
+       umount -Rd testdir || true
+       rm -rf testdir
+       dpkg -X ${PBS_DEB} testdir
+       G_SLICE=always-malloc perl -I testdir/usr/share/perl5 testdir/usr/bin/proxinstall -t test.img
+
+
 .phony: clean
 clean:
+       umount -Rd testdir || true
        make -C html-common clean
-       rm -rf *~ *.deb target build packages packages.tmp testdir 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 {} ';'