X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Makefile;h=0ab7aa0148a7f258d40f92c8740069648cb91912;hb=053c5c6c24539e419d23c05ae1bbd5f279787275;hp=5b7af6b165620b3b506136236ebbe82c52974eaa;hpb=2a674c50e2cff300bcc8961d97ed176c7fdda7bc;p=pve-qemu-kvm.git

diff --git a/Makefile b/Makefile
index 5b7af6b..0ab7aa0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 RELEASE=4.0
 
 # also update debian/changelog
-KVMVER=2.3
-KVMPKGREL=1
+KVMVER=2.4
+KVMPKGREL=15
 
 KVMPACKAGE=pve-qemu-kvm
 KVMDIR=qemu-kvm
@@ -21,9 +21,10 @@ all: ${DEBS}
 .PHONY: download
 download:
 	rm -rf ${KVMDIR} ${KVMSRC}
-	#git clone git://git.qemu-project.org/qemu.git -b stable-2.2 ${KVMDIR} 
-	git clone git://git.qemu-project.org/qemu.git ${KVMDIR} 
-	cd ${KVMDIR}; git checkout v2.3.0
+	#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.4.1; git revert --no-edit b8eb5512fd8a115f164edbbe897cdf8884920ccb
 	tar czf ${KVMSRC} --exclude CVS --exclude .git --exclude .svn ${KVMDIR}
 
 ${DEBS} kvm: ${KVMSRC}
@@ -31,6 +32,8 @@ ${DEBS} kvm: ${KVMSRC}
 	tar xf ${KVMSRC} 
 	cp -a debian ${KVMDIR}/debian
 	echo "git clone git://git.proxmox.com/git/pve-qemu-kvm.git\\ngit checkout ${GITVERSION}" > ${KVMDIR}/debian/SOURCE
+	# set package version
+	sed -i 's/^pkgversion="".*/pkgversion="${KVMPACKAGE}_${KVMVER}-${KVMPKGREL}"/' ${KVMDIR}/configure
 	cd ${KVMDIR}; dpkg-buildpackage -b -rfakeroot -us -uc
 	lintian ${DEBS} || true
 
@@ -40,6 +43,7 @@ upload: ${DEBS} ${KVMDIR}-src.tar.gz
 	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