X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Makefile;h=8cef3ba915fef6056353cbccb4fe302c3f46bb4a;hb=4895c217b333fda6f5509397e28d2d99896dd499;hp=7842e1d3983e0cd9b2b72b66dc34c8188697e1cc;hpb=de911a68ea191ae735a4d93e035b1c856715a3ed;p=pve-qemu-kvm.git

diff --git a/Makefile b/Makefile
index 7842e1d..8cef3ba 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
-RELEASE=4.0
+RELEASE=4.1
 
 # also update debian/changelog
-KVMVER=2.4
+KVMVER=2.5
 KVMPKGREL=11
 
 KVMPACKAGE=pve-qemu-kvm
@@ -22,10 +22,9 @@ all: ${DEBS}
 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} 
-	cd ${KVMDIR}; git checkout v2.4.0.1; git revert --no-edit b8eb5512fd8a115f164edbbe897cdf8884920ccb
-	# update ipxe binaries
-	cd ${KVMDIR}; git cherry-pick f4798320144245da66128edb840bd940fd287d28
+	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.1; git revert --no-edit b8eb5512fd8a115f164edbbe897cdf8884920ccb
 	tar czf ${KVMSRC} --exclude CVS --exclude .git --exclude .svn ${KVMDIR}
 
 ${DEBS} kvm: ${KVMSRC}
@@ -33,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