X-Git-Url: https://git.proxmox.com/?p=pve-qemu-kvm.git;a=blobdiff_plain;f=Makefile;h=097403dd65f00b850ccfbf278f4956435b64ed93;hp=8c1b6705f4129472c187aef8192f1a5c758e5d8d;hb=b07d35a561b120a03aae9c8c7942abe464b5b4cc;hpb=b07193f7bf1f286be06bcc0c8e7cfde2c1e627e2

diff --git a/Makefile b/Makefile
index 8c1b670..097403d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
-RELEASE=3.3
+RELEASE=4.2
 
 # also update debian/changelog
-KVMVER=2.1
-KVMPKGREL=10
+KVMVER=2.6
+KVMPKGREL=1
 
 KVMPACKAGE=pve-qemu-kvm
 KVMDIR=qemu-kvm
@@ -11,32 +11,40 @@ KVMSRC=${KVMDIR}-src.tar.gz
 ARCH=amd64
 GITVERSION:=$(shell cat .git/refs/heads/master)
 
-KVM_DEB=${KVMPACKAGE}_${KVMVER}-${KVMPKGREL}_${ARCH}.deb
+DEBS=							\
+${KVMPACKAGE}-dbg_${KVMVER}-${KVMPKGREL}_${ARCH}.deb	\
+${KVMPACKAGE}_${KVMVER}-${KVMPKGREL}_${ARCH}.deb
 
-all: ${KVM_DEB} ${KVMSRC}
+
+all: ${DEBS}
 
 .PHONY: download
 download:
 	rm -rf ${KVMDIR} ${KVMSRC}
-	git clone git://git.qemu-project.org/qemu.git -b stable-2.1 ${KVMDIR} 
-	cd ${KVMDIR}; git checkout v2.1.2
+	#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.6.0; git revert --no-edit b8eb5512fd8a115f164edbbe897cdf8884920ccb
 	tar czf ${KVMSRC} --exclude CVS --exclude .git --exclude .svn ${KVMDIR}
 
-${KVM_DEB} kvm: ${KVMSRC}
+${DEBS} kvm: ${KVMSRC}
 	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 ${KVM_DEB} || true
+	lintian ${DEBS} || true
 
 .PHONY: upload
-upload: ${KVM_DEB} ${KVMDIR}-src.tar.gz
+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
-	cp ${KVM_DEB} /pve/${RELEASE}/extra
+	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
 
@@ -46,8 +54,8 @@ distclean: clean
 
 .PHONY: clean
 clean:
-	rm -rf *~ ${KVMDIR} ${KVMPACKAGE}_*
+	rm -rf *~ ${KVMDIR} ${KVMPACKAGE}_* ${DEBS}
 
 .PHONY: dinstall
-dinstall: ${KVM_DEB}
-	dpkg -i ${KVM_DEB}
+dinstall: ${DEBS}
+	dpkg -i ${DEBS}