X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Makefile;h=7bf7eea4827c6990b92453293af612894b61e950;hb=876a4af07d924ed34bf33a05dac8653352f5dea9;hp=ee61e5483d8a41bc6509546b90b7b1661b863770;hpb=4676c0af909cf936ff18911c57c3d2a85c8527c9;p=pve-qemu-kvm.git

diff --git a/Makefile b/Makefile
index ee61e54..7bf7eea 100644
--- a/Makefile
+++ b/Makefile
@@ -1,50 +1,47 @@
-RELEASE=2.0
+RELEASE=3.2
 
 # also update debian/changelog
-KVMVER=0.15.0
-KVMPKGREL=1
+KVMVER=2.1
+KVMPKGREL=6
 
 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
 
-all: ${KVM_DEB} ${KVMDIR}-src.tar.gz
+all: ${KVM_DEB} ${KVMSRC}
 
-${KVMDIR}.org/README:
-	rm -rf ${KVMDIR}.org
-	git clone git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git ${KVMDIR}.org
-	cd ${KVMDIR}.org; git checkout -b local qemu-kvm-${KVMVER}
-	touch $@
+.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.1
+	tar czf ${KVMSRC} --exclude CVS --exclude .git --exclude .svn ${KVMDIR}
 
-${KVMDIR}-src.tar.gz: ${KVMDIR}.org/README
-	tar czf $@ ${KVMDIR}.org
-
-${KVM_DEB} kvm: ${KVMDIR}.org/README
+${KVM_DEB} kvm: ${KVMSRC}
 	rm -rf ${KVMDIR}
-	cp -a ${KVMDIR}.org ${KVMDIR}
+	tar xf ${KVMSRC} 
 	cp -a debian ${KVMDIR}/debian
-	cd ${KVMDIR}; dpkg-buildpackage -rfakeroot -us -uc
+	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
-	mkdir -p /pve/${RELEASE}/install
 	rm -rf /pve/${RELEASE}/extra/Packages*
 	rm -rf /pve/${RELEASE}/extra/${KVMPACKAGE}_*.deb
-	rm -rf /pve/${RELEASE}/install/${KVMDIR}-src.tar.gz
 	cp ${KVM_DEB} /pve/${RELEASE}/extra
-	cp  ${KVMDIR}-src.tar.gz /pve/${RELEASE}/install
 	cd /pve/${RELEASE}/extra; dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz
 	umount /pve/${RELEASE}; mount /pve/${RELEASE} -o ro
 
 .PHONY: distclean
 distclean: clean
-	rm -rf ${KVMDIR}.org ${KVMDIR}-src.tar.gz
 
 
 .PHONY: clean