X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Makefile;h=5b7af6b165620b3b506136236ebbe82c52974eaa;hb=2a674c50e2cff300bcc8961d97ed176c7fdda7bc;hp=94e4cd8a7d8513d9b551a0a39bcb489bab18d2f6;hpb=309874bde80a85c604796eef90b343d62a97a4ae;p=pve-qemu-kvm.git

diff --git a/Makefile b/Makefile
index 94e4cd8..5b7af6b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,42 +1,46 @@
-RELEASE=2.3
+RELEASE=4.0
 
 # also update debian/changelog
-KVMVER=1.3
-KVMPKGREL=12
+KVMVER=2.3
+KVMPKGREL=1
 
 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.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.2 ${KVMDIR} 
+	git clone git://git.qemu-project.org/qemu.git ${KVMDIR} 
+	cd ${KVMDIR}; git checkout v2.3.0
 	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
+	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 +50,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}