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

diff --git a/Makefile b/Makefile
index 20ed6e5..8cef3ba 100644
--- a/Makefile
+++ b/Makefile
@@ -1,42 +1,50 @@
-RELEASE=3.0
+RELEASE=4.1
 
 # also update debian/changelog
-KVMVER=1.4
-KVMPKGREL=9
+KVMVER=2.5
+KVMPKGREL=11
 
 KVMPACKAGE=pve-qemu-kvm
 KVMDIR=qemu-kvm
 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 master ${KVMDIR} 
-	cd ${KVMDIR}; git checkout -b local v1.4.0
-	# update to seabios 1.7.2.1
-	cd ${KVMDIR}; git cherry-pick 5c75fb10029c5fd1e705a6ef5d698fbea06c7a33
+	#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.1; 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}