bump version to 2.6.2-2

[pve-qemu-kvm.git] / Makefile

diff --git a/Makefile b/Makefile
index c593be562f8348793020c62cd7238057319cf51c..cd6d26277ba1a5d3a2502539b4c0ece90f21b63b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,45 +1,44 @@
-RELEASE=3.3
+RELEASE=4.2
 
 # also update debian/changelog
-KVMVER=2.2
-KVMPKGREL=4
+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)
 
-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 stable-2.1 ${KVMDIR} 
-       git clone git://git.qemu-project.org/qemu.git ${KVMDIR} 
-       cd ${KVMDIR}; git checkout v2.2.0
+       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}
 
-${KVM_DEB} kvm: ${KVMSRC}
+.PHONY: deb
+deb ${DEBS} kvm: ${KVMSRC}
+       rm -f *.deb
        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
+       # set package version
+       sed -i 's/^pkgversion="".*/pkgversion="${KVMPACKAGE}_${KVMVER}-${KVMPKGREL}"/' ${KVMDIR}/configure
        cd ${KVMDIR}; dpkg-buildpackage -b -rfakeroot -us -uc
-       lintian ${KVM_DEB} || true
+       lintian ${DEBS} || 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
+upload: ${DEBS} ${KVMDIR}-src.tar.gz
+       tar cf - ${DEBS} | ssh repoman@repo.proxmox.com upload
 
 .PHONY: distclean
 distclean: clean
@@ -47,8 +46,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}