X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Makefile;h=5bdba536fad4f476a06d0b2ae8f2791f87b77b07;hb=3d265b4e6f7135f535682dc6b60ccb396076523a;hp=8a63760fc5cda188d6cc2806ab8d3bee3f1e83d4;hpb=96f4a076e0559fbd55bc88d34d8dd952569bb11f;p=pve-qemu-kvm.git

diff --git a/Makefile b/Makefile
index 8a63760..5bdba53 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
-RELEASE=2.3
+RELEASE=4.0
 
 # also update debian/changelog
-KVMVER=1.3
+KVMVER=2.4
 KVMPKGREL=10
 
 KVMPACKAGE=pve-qemu-kvm
@@ -9,34 +9,41 @@ 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.3.0
-	cd ${KVMDIR}; git am ../seabios-update.patch
-	cd ${KVMDIR}; git am ../seabios-update2.patch
+	#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
 	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
 	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 +53,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}