improve error on '{full, linked} clone not available' error

[qemu-server.git] / Makefile

diff --git a/Makefile b/Makefile
index 575b7eeb578360ba775a907d806a1e2f4a5d4d2b..7d894549bab4616ae5f35cb7a2c9a5731c5381a7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,6 @@
-RELEASE=4.1
-
-VERSION=4.0
+VERSION=5.0
 PACKAGE=qemu-server
-PKGREL=66
+PKGREL=5
 
 CFLAGS= -O2 -Werror -Wall -Wtype-limits -Wl,-z,relro 
 
@@ -16,6 +14,7 @@ VARLIBDIR=/var/lib/${PACKAGE}
 MANDIR=${PREFIX}/share/man
 DOCDIR=${PREFIX}/share/doc
 MAN1DIR=${MANDIR}/man1/
+MAN5DIR=${MANDIR}/man5/
 BASHCOMPLDIR=${PREFIX}/share/bash-completion/completions/
 export PERLDIR=${PREFIX}/share/perl5
 PERLINCDIR=${PERLDIR}/asm-x86_64
@@ -48,27 +47,29 @@ sparsecp: sparsecp.c utils.c
        gcc ${CFLAGS} -o sparsecp sparsecp.c
 
 qm.bash-completion:
-       perl -I. -T -e "use PVE::CLI::qm; PVE::CLI::qm->generate_bash_completions();" >$@.tmp
+       PVE_GENERATING_DOCS=1 perl -I. -T -e "use PVE::CLI::qm; PVE::CLI::qm->generate_bash_completions();" >$@.tmp
        mv $@.tmp $@
 
 qmrestore.bash-completion:
-       perl -I. -T -e "use PVE::CLI::qmrestore; PVE::CLI::qmrestore->generate_bash_completions();" >$@.tmp
+       PVE_GENERATING_DOCS=1 perl -I. -T -e "use PVE::CLI::qmrestore; PVE::CLI::qmrestore->generate_bash_completions();" >$@.tmp
        mv $@.tmp $@
 
-PKGSOURCES=qm qm.1 qmrestore qmrestore.1 qmextract sparsecp vmtar control vm.conf.5 qm.bash-completion qmrestore.bash-completion
+PKGSOURCES=qm qm.1 qmrestore qmrestore.1 qmextract sparsecp vmtar control qm.conf.5 qm.bash-completion qmrestore.bash-completion
 
 .PHONY: install
 install: ${PKGSOURCES}
        install -d ${DESTDIR}/${SBINDIR}
        install -d ${DESTDIR}${LIBDIR}
        install -d ${DESTDIR}${VARLIBDIR}
-       install -d ${DESTDIR}/usr/share/man/man1
+       install -d ${DESTDIR}/${MAN1DIR}
+       install -d ${DESTDIR}/${MAN5DIR}
        install -d ${DESTDIR}/usr/share/man/man5
        install -d ${DESTDIR}/usr/share/${PACKAGE}
        install -m 0644 pve-usb.cfg ${DESTDIR}/usr/share/${PACKAGE}
        install -m 0644 pve-q35.cfg ${DESTDIR}/usr/share/${PACKAGE}
        install -m 0644 -D qm.bash-completion ${DESTDIR}/${BASHCOMPLDIR}/qm
        install -m 0644 -D qmrestore.bash-completion ${DESTDIR}/${BASHCOMPLDIR}/qmrestore
+       install -m 0644 -D bootsplash.jpg ${DESTDIR}/usr/share/${PACKAGE}
        make -C PVE install
        install -m 0755 qm ${DESTDIR}${SBINDIR}
        install -m 0755 qmrestore ${DESTDIR}${SBINDIR}
@@ -79,45 +80,47 @@ install: ${PKGSOURCES}
        install -s -m 0755 sparsecp ${DESTDIR}${LIBDIR}
        install -D -m 0644 modules-load.conf ${DESTDIR}/etc/modules-load.d/qemu-server.conf
        install -m 0755 qmextract ${DESTDIR}${LIBDIR}
-       install -m 0644 qm.1 ${DESTDIR}/usr/share/man/man1/
-       gzip -9 ${DESTDIR}/usr/share/man/man1/qm.1
-       install -m 0644 qmrestore.1 ${DESTDIR}/usr/share/man/man1/
-       gzip -9 ${DESTDIR}/usr/share/man/man1/qmrestore.1
-       install -m 0644 vm.conf.5 ${DESTDIR}/usr/share/man/man5/
-       gzip -9 ${DESTDIR}/usr/share/man/man5/vm.conf.5
-
-.PHONY: deb ${DEB}
-deb ${DEB}: ${PKGSOURCES}
+       install -m 0644 qm.1 ${DESTDIR}/${MAN1DIR}
+       gzip -9 -n ${DESTDIR}/${MAN1DIR}/qm.1
+       install -m 0644 qmrestore.1 ${DESTDIR}/${MAN1DIR}
+       gzip -9 -n ${DESTDIR}/${MAN1DIR}/qmrestore.1
+       install -m 0644 qm.conf.5 ${DESTDIR}/${MAN5DIR}
+       gzip -9 -n ${DESTDIR}/${MAN5DIR}/qm.conf.5
+       cd ${DESTDIR}/${MAN5DIR}; ln -s qm.conf.5.gz vm.conf.5.gz
+
+.PHONY: deb
+deb: ${DEB}
+${DEB}: ${PKGSOURCES} check
+       rm -f *.deb
        rm -rf build
        mkdir build
        make DESTDIR=${CURDIR}/build install
-       perl -I. ./qm verifyapi
+       PVE_GENERATING_DOCS=1 perl -I. ./qm verifyapi
        install -d -m 0755 build/DEBIAN
        install -m 0644 control build/DEBIAN
        install -m 0644 triggers build/DEBIAN
        echo "/etc/modules-load.d/qemu-server.conf" >>build/DEBIAN/conffiles
        install -D -m 0644 copyright build/${DOCDIR}/${PACKAGE}/copyright
        install -m 0644 changelog.Debian build/${DOCDIR}/${PACKAGE}/
-       gzip -9 build/${DOCDIR}/${PACKAGE}/changelog.Debian
+       gzip -9 -n build/${DOCDIR}/${PACKAGE}/changelog.Debian
        echo "git clone git://git.proxmox.com/git/qemu-server.git\\ngit checkout ${GITVERSION}" > build/${DOCDIR}/${PACKAGE}/SOURCE
-       dpkg-deb --build build  
+       fakeroot dpkg-deb --build build
        mv build.deb ${DEB}
        lintian ${DEB}
 
+.PHONY: check
+check: test
+       make -C test
+
 .PHONY: upload
-upload:
-       umount /pve/${RELEASE}; mount /pve/${RELEASE} -o rw 
-       mkdir -p /pve/${RELEASE}/extra
-       rm -rf /pve/${RELEASE}/extra/${PACKAGE}_*.deb
-       rm -rf /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 /pve/${RELEASE} -o ro
+upload: ${DEB}
+       tar cf - ${DEB} | ssh repoman@repo.proxmox.com upload --product pve --dist stretch
 
 .PHONY: clean
 clean:         
        make cleanup-docgen
-       rm -rf build *.deb control vzsyscalls.ph _h2ph_pre.ph ${PACKAGE}-*.tar.gz dist *.1.gz *.pod vmtar sparsecp *.tmp *.bash-completion
+       rm -rf build *.deb control vzsyscalls.ph _h2ph_pre.ph ${PACKAGE}-*.tar.gz dist *.1 *.5 *.pod vmtar sparsecp *.tmp *.bash-completion
+       rm -f *.buildinfo
        find . -name '*~' -exec rm {} ';'