bump version to 2.02.116-pve3

[lvm.git] / Makefile

diff --git a/Makefile b/Makefile
index 2ec39bb187ce40d3f92f6d1169c788a63fc3c90c..a69bcd912d84d8f786dfc4a6b7acfa162aabeb9e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,34 +1,34 @@
-RELEASE=2.0
+RELEASE=4.0
 
-LVMVERSION=2.02.86
-DMVERSION=1.02.65
-DEBRELEASE=1
+LVMVERSION=2.02.116
+DMVERSION=1.02.93
 # also update debian changelog patch
-PVERELEASE=${DEBRELEASE}pve2
+PVERELEASE=pve3
 PVEVER=${LVMVERSION}-${PVERELEASE}
 DMVER=${DMVERSION}-${PVERELEASE}
 
-LVMDIR=lvm2-${LVMVERSION}
-LVMSRC=lvm2_${LVMVERSION}.orig.tar.gz
-LVMDEBSRC=lvm2_${LVMVERSION}-${DEBRELEASE}.debian.tar.gz
+LVMDIR=LVM2.${LVMVERSION}
+#LVMSRC=lvm2_${LVMVERSION}.orig.tar.gz
+LVMSRC=${LVMDIR}.tgz
+
+# NOTE: we use debian package definitions from debian jessie
+# but use latest upstream sources
+LVMDEBSRC=lvm2_2.02.111-2.debian.tar.xz
 
 ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
+GITVERSION:=$(shell cat .git/refs/heads/master)
+
 
+DMPKGLIST:=dmeventd dmsetup libdevmapper1.02.1 libdevmapper-event1.02.1 libdevmapper-dev
+LVMPKGLIST:=clvm liblvm2app2.2 liblvm2cmd2.02 liblvm2-dev lvm2
 
-DEBS=                                                  \
-       clvm_${PVEVER}_${ARCH}.deb                      \
-       dmsetup_${DMVER}_${ARCH}.deb                    \
-       libdevmapper1.02.1_${DMVER}_${ARCH}.deb         \
-       libdevmapper-dev_${DMVER}_${ARCH}.deb           \
-       liblvm2app2.2_${PVEVER}_${ARCH}.deb             \
-       liblvm2cmd2.02_${PVEVER}_${ARCH}.deb            \
-       liblvm2-dev_${PVEVER}_${ARCH}.deb               \
-       lvm2_${PVEVER}_${ARCH}.deb
+DEBS=  $(foreach pkg, $(LVMPKGLIST), $(pkg)_${PVEVER}_${ARCH}.deb) \
+       $(foreach pkg, $(DMPKGLIST), $(pkg)_${DMVER}_${ARCH}.deb)
 
-all: deb
+all: ${DEBS}
 
 .PHONY: dinstall
-dinstall: deb
+dinstall: ${DEBS}
        dpkg -i ${DEBS}
 
 .PHONY: deb
@@ -36,22 +36,27 @@ deb ${DEBS}: ${LVMSRC} ${LVMDEBSRC}
        rm -rf ${LVMDIR}
        tar xf ${LVMSRC}
        cd ${LVMDIR}; tar xvf ../${LVMDEBSRC}
-       cd ${LVMDIR}; mv debian/clvm.defaults debian/clvm.default
-       cd ${LVMDIR}; ln -s ../patchdir patches; quilt push -a
+       echo "git clone git://git.proxmox.com/git/lvm.git\\ngit checkout ${GITVERSION}" > ${LVMDIR}/debian/SOURCE
+       for pkg in $(LVMPKGLIST) $(DMPKGLIST); do echo "debian/SOURCE" >> $(LVMDIR)/debian/$${pkg}.docs; done
+       cp -v patchdir/*.patch ${LVMDIR}/debian/patches
+       cat patchdir/series >> ${LVMDIR}/debian/patches/series
        cd ${LVMDIR}; dpkg-buildpackage -b -uc -us
 
 .PHONY: download
 download:
-       rm -f ${LVMSRC} ${LVMDEBSRC}
-       wget http://ftp.de.debian.org/debian/pool/main/l/lvm2/${LVMSRC}
-       wget http://ftp.de.debian.org/debian/pool/main/l/lvm2/${LVMDEBSRC}
+       rm -f ${LVMSRC}
+       wget ftp://sources.redhat.com/pub/lvm2/${LVMSRC}
+       #rm -f ${LVMSRC} ${LVMDEBSRC}
+       #wget http://ftp.de.debian.org/debian/pool/main/l/lvm2/${LVMSRC}
+       #wget http://ftp.de.debian.org/debian/pool/main/l/lvm2/${LVMDEBSRC}
 
 .PHONY: upload
-upload:
+upload: ${DEBS}
        umount /pve/${RELEASE}; mount /pve/${RELEASE} -o rw 
        mkdir -p /pve/${RELEASE}/extra
        rm -rf /pve/${RELEASE}/extra/clvm_*.deb
        rm -rf /pve/${RELEASE}/extra/lvm2_*.deb
+       rm -rf /pve/${RELEASE}/extra/dmeventd_*.deb
        rm -rf /pve/${RELEASE}/extra/dmsetup_*.deb
        rm -rf /pve/${RELEASE}/extra/liblvm2*.deb
        rm -rf /pve/${RELEASE}/extra/libdevmapper*.deb
@@ -63,3 +68,4 @@ upload:
 .PHONY: clean
 clean:
        rm -rf *~ *_${ARCH}.deb *_${ARCH}.udeb *.changes *.dsc ${LVMDIR}
+       find . -name '*~' -exec rm {} ';'