add upload/dinstall target, use correct release version

diff --git a/Makefile b/Makefile
index c1ebbb78fb12d78ea327122861d47e9a4015305c..78c6b2aaf9801749352974cc1da2ae8edd45f0b1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,38 @@
-
+RELEASE=2.0
 
 LVMVERSION=2.02.86
-LVMRELEASE=1
+DMVERSION=1.02.65
+DEBRELEASE=1
+# also update debian changelog patch
+PVERELEASE=${DEBRELEASE}pve1
+PVEVER=${LVMVERSION}-${PVERELEASE}
+DMVER=${DMVERSION}-${PVERELEASE}
+
 LVMDIR=lvm2-${LVMVERSION}
 LVMSRC=lvm2_${LVMVERSION}.orig.tar.gz
-LVMDEBSRC=lvm2_${LVMVERSION}-${LVMRELEASE}.debian.tar.gz
+LVMDEBSRC=lvm2_${LVMVERSION}-${DEBRELEASE}.debian.tar.gz
 
 ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
-all: ${LVMSRC} ${LVMDEBSRC}
+
+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
+
+all: deb
+
+.PHONY: dinstall
+dinstall: deb
+       dpkg -i ${DEBS}
+
+.PHONY: deb
+deb ${DEBS}: ${LVMSRC} ${LVMDEBSRC}
        rm -rf ${LVMDIR} tmpdeb
        mkdir tmpdeb
        cd tmpdeb; tar xvf ../${LVMDEBSRC}
@@ -24,6 +48,20 @@ download:
        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:
+       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/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 *~ tmpdeb *_${ARCH}.deb *_${ARCH}.udeb *.changes *.dsc ${LVMDIR}

diff --git a/patchdir/fix-build-dependencies.patch b/patchdir/fix-build-dependencies.patch
index 10d1d1a71ede9d27e79fa412e507ff6e99deb146..0982205afc5972bdd80e1246b36e60721b019bbe 100644 (file)
--- a/patchdir/fix-build-dependencies.patch
+++ b/patchdir/fix-build-dependencies.patch
@@ -1,17 +1,20 @@
-Index: lvm2new/debian/control
+Index: new/debian/control
 ===================================================================
---- lvm2new.orig/debian/control        2011-09-20 09:30:56.000000000 +0200
-+++ lvm2new/debian/control     2011-09-20 10:14:57.000000000 +0200
-@@ -3,7 +3,7 @@
+--- new.orig/debian/control    2011-09-20 12:49:53.000000000 +0200
++++ new/debian/control 2011-09-20 12:52:06.000000000 +0200
+@@ -1,9 +1,8 @@
+ Source: lvm2
+ Section: admin
  Priority: optional
- Maintainer: Debian LVM Team <pkg-lvm-maintainers@lists.alioth.debian.org>
- Uploaders: Bastian Blank <waldi@debian.org>
+-Maintainer: Debian LVM Team <pkg-lvm-maintainers@lists.alioth.debian.org>
+-Uploaders: Bastian Blank <waldi@debian.org>
 -Build-Depends: debhelper (>> 7), automake, libcman-dev (>> 2), libdlm-dev (>> 2), libreadline-gplv2-dev, libselinux1-dev, libudev-dev, pkg-config, quilt
++Maintainer: Proxmox Support Team <support@proxmox.com>
 +Build-Depends: debhelper (>> 7), automake, redhat-cluster-pve-dev, libreadline6-dev, libselinux1-dev, libudev-dev, pkg-config, quilt
  Standards-Version: 3.9.1
  Homepage: http://sources.redhat.com/lvm2/
  Vcs-Svn: svn://svn.debian.org/pkg-lvm/lvm2/trunk/
-@@ -39,7 +39,7 @@
+@@ -39,7 +38,7 @@
  Package: clvm
  Priority: extra
  Architecture: any

diff --git a/patchdir/fix-changelog.patch b/patchdir/fix-changelog.patch
new file mode 100644 (file)
index 0000000..5d2e4f4
--- /dev/null
+++ b/patchdir/fix-changelog.patch
@@ -0,0 +1,14 @@
+Index: new/debian/changelog
+===================================================================
+--- new.orig/debian/changelog  2011-09-20 12:49:41.000000000 +0200
++++ new/debian/changelog       2011-09-20 12:53:25.000000000 +0200
+@@ -1,3 +1,9 @@
++lvm2 (2.02.86-1pve1) unstable; urgency=low
++  
++  * backport to squeeze for use with Proxmox VE
++  
++ -- Proxmox Support Team <support@proxmox.com>  Tue, 20 Sep 2011 12:53:25 +0200
++  
+ lvm2 (2.02.86-1) unstable; urgency=low
+ 
+   * New upstream version.

diff --git a/patchdir/series b/patchdir/series
index 54abfe9c0a6d98d1124a35644dbff56efd0b4d37..161237e11da5b32bd06c54ae6b4dfd475501869b 100644 (file)
--- a/patchdir/series
+++ b/patchdir/series
@@ -1,2 +1,3 @@
 fix-build-dependencies.patch
 fix-clvm-init-script.patch
+fix-changelog.patch