bump version to 2.6.2-2

[pve-qemu-kvm.git] / Makefile

diff --git a/Makefile b/Makefile
index 1f367f2ddd4189178e7b59e53c1d229a387af938..cd6d26277ba1a5d3a2502539b4c0ece90f21b63b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,15 @@
-RELEASE=4.0
+RELEASE=4.2
 
 # also update debian/changelog
-KVMVER=2.4
-KVMPKGREL=16
+KVMVER=2.6.2
+KVMPKGREL=2
 
 KVMPACKAGE=pve-qemu-kvm
 KVMDIR=qemu-kvm
 KVMSRC=${KVMDIR}-src.tar.gz
 
 ARCH=amd64
-GITVERSION:=$(shell cat .git/refs/heads/master)
+GITVERSION:=$(shell git rev-parse master)
 
 DEBS=                                                  \
 ${KVMPACKAGE}-dbg_${KVMVER}-${KVMPKGREL}_${ARCH}.deb   \
@@ -21,13 +21,12 @@ all: ${DEBS}
 .PHONY: download
 download:
        rm -rf ${KVMDIR} ${KVMSRC}
-       #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.4.1; git revert --no-edit b8eb5512fd8a115f164edbbe897cdf8884920ccb
+       git clone --depth=1 git://git.qemu-project.org/qemu.git -b v${KVMVER} ${KVMDIR}
        tar czf ${KVMSRC} --exclude CVS --exclude .git --exclude .svn ${KVMDIR}
 
-${DEBS} kvm: ${KVMSRC}
+.PHONY: deb
+deb ${DEBS} kvm: ${KVMSRC}
+       rm -f *.deb
        rm -rf ${KVMDIR}
        tar xf ${KVMSRC} 
        cp -a debian ${KVMDIR}/debian
@@ -39,14 +38,7 @@ ${DEBS} kvm: ${KVMSRC}
 
 .PHONY: upload
 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
-       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
+       tar cf - ${DEBS} | ssh repoman@repo.proxmox.com upload
 
 .PHONY: distclean
 distclean: clean