X-Git-Url: https://git.proxmox.com/?p=qemu-server.git;a=blobdiff_plain;f=Makefile;h=bdad7190c5cc065c7a22bb1596af562ee640f2ba;hp=7f0a3c73430b39699631b3b41ce282dd8b08884a;hb=eff36b2caa6a008da253c24f86ef573721b28726;hpb=5dddefeab63ce62d7084b0a34c20cbf828767e78

diff --git a/Makefile b/Makefile
index 7f0a3c7..bdad719 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
-RELEASE=4.2
-
-VERSION=4.0
+VERSION=5.0
 PACKAGE=qemu-server
-PKGREL=81
+PKGREL=46
 
-CFLAGS= -O2 -Werror -Wall -Wtype-limits -Wl,-z,relro 
+CFLAGS+=-O2 -Werror -Wall -Wextra -Wpedantic -Wtype-limits -Wl,-z,relro -std=gnu11
+JSON_CFLAGS=$(shell pkg-config --cflags json-c)
+JSON_LIBS=$(shell pkg-config --libs json-c)
 
 DESTDIR=
 PREFIX=/usr
@@ -12,115 +12,121 @@ BINDIR=${PREFIX}/bin
 SBINDIR=${PREFIX}/sbin
 BINDIR=${PREFIX}/bin
 LIBDIR=${PREFIX}/lib/${PACKAGE}
+SERVICEDIR=/lib/systemd/system
 VARLIBDIR=/var/lib/${PACKAGE}
 MANDIR=${PREFIX}/share/man
 DOCDIR=${PREFIX}/share/doc
 MAN1DIR=${MANDIR}/man1/
 MAN5DIR=${MANDIR}/man5/
+MAN8DIR=${MANDIR}/man8/
 BASHCOMPLDIR=${PREFIX}/share/bash-completion/completions/
+ZSHCOMPLDIR=${PREFIX}/share/zsh/vendor-completions/
 export PERLDIR=${PREFIX}/share/perl5
 PERLINCDIR=${PERLDIR}/asm-x86_64
 
 ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
-GITVERSION:=$(shell cat .git/refs/heads/master)
+GITVERSION:=$(shell git rev-parse HEAD)
 
 DEB=${PACKAGE}_${VERSION}-${PKGREL}_${ARCH}.deb
+DBG_DEB=${PACKAGE}-dbgsym_${VERSION}-${PKGREL}_${ARCH}.deb
+
+DEBS=${DEB} ${DBG_DEB}
 
 # this requires package pve-doc-generator
 export NOVIEW=1
 include /usr/share/pve-doc-generator/pve-doc-generator.mk
 
-all: ${DEB}
+export SOURCE_DATE_EPOCH ?= $(shell dpkg-parsechangelog -STimestamp)
+
+all:
 
 .PHONY: dinstall
 dinstall: deb
 	dpkg -i ${DEB}
 
-control: control.in
-	sed -e s/@@VERSION@@/${VERSION}/ -e s/@@PKGRELEASE@@/${PKGREL}/ -e s/@@ARCH@@/${ARCH}/<$< >$@
-
-vzsyscalls.ph: vzsyscalls.h
-	 h2ph -d . vzsyscalls.h
-
-vmtar: vmtar.c utils.c
-	gcc ${CFLAGS} -o vmtar vmtar.c
-
-sparsecp: sparsecp.c utils.c
-	gcc ${CFLAGS} -o sparsecp sparsecp.c
+qmeventd: qmeventd.c
+	$(CC) $(CFLAGS) ${JSON_CFLAGS} -o $@ $< ${JSON_LIBS}
 
 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 qm.conf.5 qm.bash-completion qmrestore.bash-completion
+qm.zsh-completion:
+	PVE_GENERATING_DOCS=1 perl -I. -T -e "use PVE::CLI::qm; PVE::CLI::qm->generate_zsh_completions();" >$@.tmp
+	mv $@.tmp $@
+
+qmrestore.zsh-completion:
+	PVE_GENERATING_DOCS=1 perl -I. -T -e "use PVE::CLI::qmrestore; PVE::CLI::qmrestore->generate_zsh_completions();" >$@.tmp
+	mv $@.tmp $@
+
+PKGSOURCES=qm qm.1 qmrestore qmrestore.1 qmextract qm.conf.5 qm.bash-completion qmrestore.bash-completion \
+	    qm.zsh-completion qmrestore.zsh-completion qmeventd qmeventd.8
 
 .PHONY: install
 install: ${PKGSOURCES}
 	install -d ${DESTDIR}/${SBINDIR}
 	install -d ${DESTDIR}${LIBDIR}
 	install -d ${DESTDIR}${VARLIBDIR}
+	install -d ${DESTDIR}${SERVICEDIR}
 	install -d ${DESTDIR}/${MAN1DIR}
 	install -d ${DESTDIR}/${MAN5DIR}
+	install -d ${DESTDIR}/${MAN8DIR}
 	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 qm.zsh-completion ${DESTDIR}/${ZSHCOMPLDIR}/_qm
+	install -m 0644 -D qmrestore.zsh-completion ${DESTDIR}/${ZSHCOMPLDIR}/_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}
+	install -m 0755 qmeventd ${DESTDIR}${SBINDIR}
+	install -m 0644 qmeventd.service ${DESTDIR}${SERVICEDIR}
 	install -m 0755 pve-bridge ${DESTDIR}${VARLIBDIR}/pve-bridge
 	install -m 0755 pve-bridge-hotplug ${DESTDIR}${VARLIBDIR}/pve-bridge-hotplug
 	install -m 0755 pve-bridgedown ${DESTDIR}${VARLIBDIR}/pve-bridgedown
-	install -s -m 0755 vmtar ${DESTDIR}${LIBDIR}
-	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}/${MAN1DIR}
-	gzip -9 ${DESTDIR}/${MAN1DIR}/qm.1
+	gzip -9 -n -f ${DESTDIR}/${MAN1DIR}/qm.1
+	install -m 0644 qmeventd.8 ${DESTDIR}/${MAN8DIR}
+	gzip -9 -n -f ${DESTDIR}/${MAN8DIR}/qmeventd.8
 	install -m 0644 qmrestore.1 ${DESTDIR}/${MAN1DIR}
-	gzip -9 ${DESTDIR}/${MAN1DIR}/qmrestore.1
+	gzip -9 -n -f ${DESTDIR}/${MAN1DIR}/qmrestore.1
 	install -m 0644 qm.conf.5 ${DESTDIR}/${MAN5DIR}
-	gzip -9 ${DESTDIR}/${MAN5DIR}/qm.conf.5
-	cd ${DESTDIR}/${MAN5DIR}; ln -s qm.conf.5.gz vm.conf.5.gz
+	gzip -9 -n -f ${DESTDIR}/${MAN5DIR}/qm.conf.5
+	cd ${DESTDIR}/${MAN5DIR}; ln -s -f qm.conf.5.gz vm.conf.5.gz
 
-.PHONY: deb ${DEB}
-deb ${DEB}: ${PKGSOURCES}
+.PHONY: deb
+deb: ${DEBS}
+${DBG_DEB}: ${DEB}
+${DEB}:
 	rm -rf build
-	mkdir build
-	make DESTDIR=${CURDIR}/build install
-	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
-	echo "git clone git://git.proxmox.com/git/qemu-server.git\\ngit checkout ${GITVERSION}" > build/${DOCDIR}/${PACKAGE}/SOURCE
-	dpkg-deb --build build	
-	mv build.deb ${DEB}
-	lintian ${DEB}
+	rsync -a * build
+	echo "git clone git://git.proxmox.com/git/qemu-server.git\\ngit checkout ${GITVERSION}" > build/debian/SOURCE
+	cd build; dpkg-buildpackage -b -us -uc
+	lintian ${DEBS}
+
+.PHONY: test
+test:
+	PVE_GENERATING_DOCS=1 perl -I. ./qm verifyapi
+	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 - ${DEBS} | ssh repoman@repo.proxmox.com upload --product pve --dist stretch
 
 .PHONY: clean
-clean: 	
+clean:
 	make cleanup-docgen
-	rm -rf build *.deb control vzsyscalls.ph _h2ph_pre.ph ${PACKAGE}-*.tar.gz dist *.1 *.5 *.pod vmtar sparsecp *.tmp *.bash-completion
+	rm -rf build *.deb *.buildinfo *.changes qmeventd
 	find . -name '*~' -exec rm {} ';'