X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Makefile;h=8ef90b7b9e3b52c3b48796e3740a66e9bfbd55e8;hb=97b0be3808fbb33d72f736dd77bb7b31910c362f;hp=559706824b0063edc9090069d2e3f3d74d5d68cd;hpb=92bf040c0f3a4aa0d70957dc16f47a03c49d6fe1;p=pve-qemu-kvm.git

diff --git a/Makefile b/Makefile
index 5597068..8ef90b7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,15 @@
-RELEASE=2.3
+RELEASE=3.4
 
 # also update debian/changelog
-KVMVER=1.4
-KVMPKGREL=1
+KVMVER=2.2
+KVMPKGREL=26
 
 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
 
@@ -17,26 +18,22 @@ all: ${KVM_DEB} ${KVMSRC}
 .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.0rc1
+	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.2.1
 	tar czf ${KVMSRC} --exclude CVS --exclude .git --exclude .svn ${KVMDIR}
 
 ${KVM_DEB} 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
 
 .PHONY: upload
 upload: ${KVM_DEB} ${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
-	cd /pve/${RELEASE}/extra; dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz
-	umount /pve/${RELEASE}; mount /pve/${RELEASE} -o ro
+	tar -cf - ${KVM_DEB} | ssh repoman@repo.proxmox.com upload --dist wheezy
 
 .PHONY: distclean
 distclean: clean