bump version to 2.4-14

[pve-qemu-kvm.git] / Makefile

diff --git a/Makefile b/Makefile
index 7842e1d3983e0cd9b2b72b66dc34c8188697e1cc..0c3b59ba8ebef143435e19104fa5482d5bf795d0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ RELEASE=4.0
 
 # also update debian/changelog
 KVMVER=2.4
-KVMPKGREL=11
+KVMPKGREL=14
 
 KVMPACKAGE=pve-qemu-kvm
 KVMDIR=qemu-kvm
@@ -23,9 +23,7 @@ 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} 
-       cd ${KVMDIR}; git checkout v2.4.0.1; git revert --no-edit b8eb5512fd8a115f164edbbe897cdf8884920ccb
-       # update ipxe binaries
-       cd ${KVMDIR}; git cherry-pick f4798320144245da66128edb840bd940fd287d28
+       cd ${KVMDIR}; git checkout v2.4.1; git revert --no-edit b8eb5512fd8a115f164edbbe897cdf8884920ccb
        tar czf ${KVMSRC} --exclude CVS --exclude .git --exclude .svn ${KVMDIR}
 
 ${DEBS} kvm: ${KVMSRC}
@@ -33,6 +31,8 @@ ${DEBS} kvm: ${KVMSRC}
        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 ${DEBS} || true