bump version to 2.03.02-pve4

[lvm.git] / Makefile

diff --git a/Makefile b/Makefile
index bcb9a8aaeb52d1d1bda68c85c7953d377914c5c6..0f86705344a9def0de50dbc050051ab2ed580995 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,27 +1,22 @@
-LVMVERSION=2.02.116
-DMVERSION=1.02.93
-# also update debian changelog patch
-PVERELEASE=pve3
-PVEVER=${LVMVERSION}-${PVERELEASE}
-DMVER=${DMVERSION}-${PVERELEASE}
+LVMVERSION=2.03.02
+DMVERSION=1.02.155
+DEBTAG=debian/2.03.02-3
 
-LVMDIR=LVM2.${LVMVERSION}
-#LVMSRC=lvm2_${LVMVERSION}.orig.tar.gz
-LVMSRC=${LVMDIR}.tgz
+PVERELEASE=pve4
+PVELVMVER=${LVMVERSION}-${PVERELEASE}
+PVEDMVER=${DMVERSION}-${PVERELEASE}
 
-# NOTE: we use debian package definitions from debian jessie
-# but use latest upstream sources
-LVMDEBSRC=lvm2_2.02.111-2.debian.tar.xz
+LVMDIR=LVM2.${LVMVERSION}
+LVMSRC=${LVMDIR}.tar
 
-ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
+ARCH:=$(shell dpkg-architecture -qDEB_HOST_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
+LVMPKGLIST:=liblvm2cmd2.03 liblvm2-dev lvm2 lvm2-lockd lvm2-dbusd
 
-DEBS=  $(foreach pkg, $(LVMPKGLIST), $(pkg)_${PVEVER}_${ARCH}.deb) \
-       $(foreach pkg, $(DMPKGLIST), $(pkg)_${DMVER}_${ARCH}.deb)
+DEBS=  $(foreach pkg, $(LVMPKGLIST), $(pkg)_${PVELVMVER}_${ARCH}.deb) \
+       $(foreach pkg, $(DMPKGLIST), $(pkg)_${PVEDMVER}_${ARCH}.deb)
 
 all: ${DEBS}
 
@@ -30,29 +25,34 @@ dinstall: ${DEBS}
        dpkg -i ${DEBS}
 
 .PHONY: deb
-deb ${DEBS}: ${LVMSRC} ${LVMDEBSRC}
+deb: ${DEBS}
+${DEBS}: ${LVMSRC}
        rm -rf ${LVMDIR}
        tar xf ${LVMSRC}
-       cd ${LVMDIR}; tar xvf ../${LVMDEBSRC}
        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
+       # Note: the patches in patchdir are not used by the build process, so apply them manually here!
+       cd ${LVMDIR}; ln -s ../patchdir patches
+       cd ${LVMDIR}; quilt push -a
+       cd ${LVMDIR}; rm -rf .pc ./patches
+       mv ${LVMDIR}/debian/changelog ${LVMDIR}/debian/changelog.org
+       cat changelog.Debian ${LVMDIR}/debian/changelog.org > ${LVMDIR}/debian/changelog
        cd ${LVMDIR}; dpkg-buildpackage -b -uc -us
+       lintian ${DEBS}
 
 .PHONY: download
 download:
        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}
+       rm -rf ${LVMDIR}
+       git clone -b ${DEBTAG} https://salsa.debian.org/lvm-team/lvm2.git ${LVMDIR}
+       tar cf ${LVMSRC} --exclude ".git" ${LVMDIR}
+
 
 .PHONY: upload
 upload: ${DEBS}
-       tar cf - ${DEBS} | ssh repoman@repo.proxmox.com upload
+       tar cf - ${DEBS} | ssh repoman@repo.proxmox.com -- upload --product pve --dist stretch --arch ${ARCH}
 
 .PHONY: clean
 clean:
-       rm -rf *~ *_${ARCH}.deb *_${ARCH}.udeb *.changes *.dsc ${LVMDIR}
+       rm -rf *~ *_${ARCH}.deb *_${ARCH}.udeb *.changes *.dsc *.buildinfo ${LVMDIR}
        find . -name '*~' -exec rm {} ';'