run_command: better return status check - recognice signals

[pve-installer.git] / Makefile

diff --git a/Makefile b/Makefile
index 021ee727f77746de851d173958fbc766e317621d..5c88f670bf05fe87ae8ed039e3f247a68346357b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,20 +1,20 @@
 # achtung: also set release in proxinstall!
-RELEASE=3.3
+RELEASE=5.0
 
-DEB=pve-installer_3.3-1_all.deb
+DEB=pve-installer_5.0-7_all.deb
 
 INSTALLER_SOURCES=             \
        unconfigured.sh         \
-       xorg.conf.fbdev         \
        fake-start-stop-daemon  \
        policy-disable-rc.d     \
        interfaces              \
-       proxlogo.xpm            \
+       proxlogo.png            \
        checktime               \
        proxinstall
 
 HTML_SOURCES=$(wildcard html/*.htm) $(wildcard html/*.css) $(wildcard html/*.png)
 
+deb: ${DEB}
 ${DEB}: ${INSTALLER_SOURCES} ${HTML_SOURCES} Makefile html/Makefile
        rm -rf debian
        mkdir debian
@@ -22,7 +22,7 @@ ${DEB}: ${INSTALLER_SOURCES} ${HTML_SOURCES} Makefile html/Makefile
        mkdir debian/DEBIAN
        install -m 0644 control debian/DEBIAN
        install -m 0644 conffiles debian/DEBIAN
-       dpkg-deb --build debian ${DEB}
+       fakeroot dpkg-deb --build debian ${DEB}
        rm -rf debian
        lintian -X man ${DEB}
 
@@ -31,31 +31,23 @@ install: ${INSTALLER_SOURCES} ${HTML_SOURCES}
        make DESTDIR=`pwd`/debian -C html install
        install -D -m 644 interfaces ${DESTDIR}/etc/network/interfaces
        mkdir -p ${DESTDIR}/var/lib/dhcp3/
-       ln -s /tmp/dhclient.eth0.leases ${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 proxlogo.xpm  ${DESTDIR}/var/lib/pve-installer/proxlogo.xpm
+       install -D -m 644 proxlogo.png  ${DESTDIR}/var/lib/pve-installer/proxlogo.png
        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
-       install -D -m 644 xorg.conf.fbdev  ${DESTDIR}/etc/X11/xorg.conf
        install -D -m 644 copyright ${DESTDIR}/usr/share/doc/pve-installer/copyright
        install -D -m 644 changelog.Debian  ${DESTDIR}/usr/share/doc/pve-installer/changelog.Debian
-       gzip --best  ${DESTDIR}/usr/share/doc/pve-installer/changelog.Debian
+       gzip -n --best  ${DESTDIR}/usr/share/doc/pve-installer/changelog.Debian
 
 .phony: upload
 upload: ${DEB}
-       umount /pve/${RELEASE}; mount -o rw /pve/${RELEASE}
-       mkdir -p /pve/${RELEASE}/extra
-       rm -rf /pve/${RELEASE}/extra/pve-installer_*.deb
-       rm -f /pve/${RELEASE}/extra/Packages*
-       cp ${DEB} /pve/${RELEASE}/extra
-       cd /pve/${RELEASE}/extra; dpkg-scanpackages . /dev/null  > Packages; gzip -9c Packages > Packages.gz
-       umount /pve/${RELEASE}; mount -o ro /pve/${RELEASE}
+       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
@@ -63,7 +55,7 @@ packages: /pve/${RELEASE}/install/pve.files
        mv packages.tmp packages
 
 test.img:
-       dd if=/dev/zero of=test.img bs=1024 count=800000
+       dd if=/dev/zero of=test.img bs=2048 count=1M
 
 check: packages test.img
        G_SLICE=always-malloc ./proxinstall -t test.img