X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Makefile;h=a29723490687b1bbea5db6169004562a14ff58f6;hb=4656de7f25c93566b73d64f30300cff21da48b8d;hp=c1ebbb78fb12d78ea327122861d47e9a4015305c;hpb=fe305e81306a49214b20e9d075ca8424e4e96303;p=lvm.git

diff --git a/Makefile b/Makefile
index c1ebbb7..a297234 100644
--- a/Makefile
+++ b/Makefile
@@ -1,29 +1,71 @@
+RELEASE=4.0
 
+LVMVERSION=2.02.116
+DMVERSION=1.02.93
+# also update debian changelog patch
+PVERELEASE=pve2
+PVEVER=${LVMVERSION}-${PVERELEASE}
+DMVER=${DMVERSION}-${PVERELEASE}
 
-LVMVERSION=2.02.86
-LVMRELEASE=1
-LVMDIR=lvm2-${LVMVERSION}
-LVMSRC=lvm2_${LVMVERSION}.orig.tar.gz
-LVMDEBSRC=lvm2_${LVMVERSION}-${LVMRELEASE}.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= 	$(foreach pkg, $(LVMPKGLIST), $(pkg)_${PVEVER}_${ARCH}.deb) \
+	$(foreach pkg, $(DMPKGLIST), $(pkg)_${DMVER}_${ARCH}.deb)
 
-all: ${LVMSRC} ${LVMDEBSRC}
-	rm -rf ${LVMDIR} tmpdeb
-	mkdir tmpdeb
-	cd tmpdeb; tar xvf ../${LVMDEBSRC}
-	mv tmpdeb/debian/clvm.defaults tmpdeb/debian/clvm.default
-	cd tmpdeb; ln -s ../patchdir patches; quilt push -a	
+all: ${DEBS}
+
+.PHONY: dinstall
+dinstall: ${DEBS}
+	dpkg -i ${DEBS}
+
+.PHONY: deb
+deb ${DEBS}: ${LVMSRC} ${LVMDEBSRC}
+	rm -rf ${LVMDIR}
 	tar xf ${LVMSRC}
-	cp -av tmpdeb/debian ${LVMDIR}
+	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
 	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: ${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
+	rm -rf /pve/${RELEASE}/extra/Packages*
+	cp ${DEBS} /pve/${RELEASE}/extra
+	cd /pve/${RELEASE}/extra; dpkg-scanpackages . /dev/null > Packages; gzip -9c Packages > Packages.gz
+	umount /pve/${RELEASE}; mount /pve/${RELEASE} -o ro
 
 .PHONY: clean
 clean:
-	rm -rf *~ tmpdeb debian/*~ *_${ARCH}.deb *_${ARCH}.udeb *.changes *.dsc ${LVMDIR}
+	rm -rf *~ *_${ARCH}.deb *_${ARCH}.udeb *.changes *.dsc ${LVMDIR}
+	find . -name '*~' -exec rm {} ';'