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

diff --git a/Makefile b/Makefile
index 7842e1d..9452c09 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
-RELEASE=4.0
+RELEASE=4.2
 
 # also update debian/changelog
-KVMVER=2.4
-KVMPKGREL=11
+KVMVER=2.6
+KVMPKGREL=1
 
 KVMPACKAGE=pve-qemu-kvm
 KVMDIR=qemu-kvm
@@ -21,18 +21,18 @@ 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} 
-	cd ${KVMDIR}; git checkout v2.4.0.1; git revert --no-edit b8eb5512fd8a115f164edbbe897cdf8884920ccb
-	# update ipxe binaries
-	cd ${KVMDIR}; git cherry-pick f4798320144245da66128edb840bd940fd287d28
+	git clone --depth=1 git://git.qemu-project.org/qemu.git -b v2.6.0 ${KVMDIR}
 	tar czf ${KVMSRC} --exclude CVS --exclude .git --exclude .svn ${KVMDIR}
 
-${DEBS} kvm: ${KVMSRC}
+.PHONY: deb
+deb ${DEBS} kvm: ${KVMSRC}
+	rm -f *.deb
 	rm -rf ${KVMDIR}
 	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