X-Git-Url: https://git.proxmox.com/?p=pve-qemu-kvm.git;a=blobdiff_plain;f=Makefile;h=554427f51cae2fa70ee7bd29f4b424470ced55ac;hp=193986fd43a9966c978e9292b5b1f5e2db92956d;hb=a786865520083c28bf89c7d6ab2e2298f4e0376f;hpb=fe34159215cee282685098f038073275908dbb49

diff --git a/Makefile b/Makefile
index 193986f..554427f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,33 +1,33 @@
-RELEASE=4.1
-
 # also update debian/changelog
-KVMVER=2.5
-KVMPKGREL=8
+KVMVER=2.9.0
+KVMTAG=$(KVMVER)-rc2
+KVMPKGREL=1~rc2+4
 
 KVMPACKAGE=pve-qemu-kvm
 KVMDIR=qemu-kvm
 KVMSRC=${KVMDIR}-src.tar.gz
 
-ARCH=amd64
-GITVERSION:=$(shell cat .git/refs/heads/master)
+ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+GITVERSION:=$(shell git rev-parse master)
 
-DEBS=							\
-${KVMPACKAGE}-dbg_${KVMVER}-${KVMPKGREL}_${ARCH}.deb	\
-${KVMPACKAGE}_${KVMVER}-${KVMPKGREL}_${ARCH}.deb
+DEB=${KVMPACKAGE}_${KVMVER}-${KVMPKGREL}_${ARCH}.deb
+DEB_DBG=${KVMPACKAGE}-dbg_${KVMVER}-${KVMPKGREL}_${ARCH}.deb
+DEBS=$(DEB) $(DEB_DBG)
 
 
-all: ${DEBS}
+all: $(DEBS)
 
 .PHONY: download
 download:
 	rm -rf ${KVMDIR} ${KVMSRC}
-	#git clone git://git.qemu-project.org/qemu.git -b stable-2.4 ${KVMDIR} 
-	git clone git://git.qemu-project.org/qemu.git ${KVMDIR}
-	# see https://bugs.launchpad.net/qemu/+bug/1488363?comments=all
-	cd ${KVMDIR}; git checkout v2.5.0; git revert --no-edit b8eb5512fd8a115f164edbbe897cdf8884920ccb
+	git clone --depth=1 git://git.qemu-project.org/qemu.git -b v${KVMTAG} ${KVMDIR}
 	tar czf ${KVMSRC} --exclude CVS --exclude .git --exclude .svn ${KVMDIR}
 
-${DEBS} kvm: ${KVMSRC}
+.PHONY: deb kvm
+deb kvm: $(DEBS)
+$(DEB_DBG): $(DEB)
+$(DEB): $(KVMSRC)
+	rm -f *.deb
 	rm -rf ${KVMDIR}
 	tar xf ${KVMSRC} 
 	cp -a debian ${KVMDIR}/debian
@@ -38,15 +38,8 @@ ${DEBS} kvm: ${KVMSRC}
 	lintian ${DEBS} || true
 
 .PHONY: upload
-upload: ${DEBS} ${KVMDIR}-src.tar.gz
-	umount /pve/${RELEASE}; mount /pve/${RELEASE} -o rw 
-	mkdir -p /pve/${RELEASE}/extra
-	rm -rf /pve/${RELEASE}/extra/Packages*
-	rm -rf /pve/${RELEASE}/extra/${KVMPACKAGE}_*.deb
-	rm -rf /pve/${RELEASE}/extra/${KVMPACKAGE}-dbg_*.deb
-	cp ${DEBS} /pve/${RELEASE}/extra
-	cd /pve/${RELEASE}/extra; dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz
-	umount /pve/${RELEASE}; mount /pve/${RELEASE} -o ro
+upload: ${DEBS}
+	tar cf - ${DEBS} | ssh repoman@repo.proxmox.com upload --product pve --dist stretch
 
 .PHONY: distclean
 distclean: clean
@@ -54,7 +47,7 @@ distclean: clean
 
 .PHONY: clean
 clean:
-	rm -rf *~ ${KVMDIR} ${KVMPACKAGE}_* ${DEBS}
+	rm -rf *.changes *.buildinfo ${KVMDIR} ${KVMPACKAGE}_* ${DEBS}
 
 .PHONY: dinstall
 dinstall: ${DEBS}