-RELEASE=3.0
+RELEASE=4.0
-LVMVERSION=2.02.98
-DMVERSION=1.02.77
+LVMVERSION=2.02.116
+DMVERSION=1.02.93
# also update debian changelog patch
-PVERELEASE=pve4
+PVERELEASE=pve1
PVEVER=${LVMVERSION}-${PVERELEASE}
DMVER=${DMVERSION}-${PVERELEASE}
-LVMDIR=lvm2-${LVMVERSION}
-LVMSRC=lvm2_${LVMVERSION}.orig.tar.gz
+LVMDIR=LVM2.${LVMVERSION}
+#LVMSRC=lvm2_${LVMVERSION}.orig.tar.gz
+LVMSRC=${LVMDIR}.tgz
-# NOTE: we use debian package definitions from debian testing
+# NOTE: we use debian package definitions from debian jessie
# but use latest upstream sources
-DEBRELEASE=5
-LVMDEBSRC=lvm2_${LVMVERSION}-${DEBRELEASE}.debian.tar.gz
+LVMDEBSRC=lvm2_2.02.111-2.debian.tar.xz
ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
GITVERSION:=$(shell cat .git/refs/heads/master)
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
.PHONY: download
download:
- rm -f ${LVMSRC} ${LVMDEBSRC}
- #wget ftp://sources.redhat.com/pub/lvm2/${LVMSRC}
- 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
.PHONY: clean
clean:
rm -rf *~ *_${ARCH}.deb *_${ARCH}.udeb *.changes *.dsc ${LVMDIR}
+ find . -name '*~' -exec rm {} ';'
--- /dev/null
+Index: new/debian/rules
+===================================================================
+--- new.orig/debian/rules
++++ new/debian/rules
+@@ -76,7 +76,7 @@ $(STAMPS_DIR)/setup_deb: $(STAMPS_DIR)/s
+ --with-usrlibdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
+ --with-optimisation="$(CFLAGS_OPT_DEB)" \
+ --with-cache=internal \
+- --with-clvmd=cman,corosync,openais \
++ --with-clvmd=corosync \
+ --with-cluster=internal \
+ --with-device-uid=0 \
+ --with-device-gid=6 \
-Index: lvm2-2.02.98/debian/changelog
+Index: new/debian/changelog
===================================================================
---- lvm2-2.02.98.orig/debian/changelog 2013-08-07 15:45:29.000000000 +0200
-+++ lvm2-2.02.98/debian/changelog 2013-08-13 12:06:27.000000000 +0200
-@@ -1,3 +1,53 @@
-+lvm2 (2.02.98-pve4) unstable; urgency=low
+--- new.orig/debian/changelog
++++ new/debian/changelog
+@@ -1,3 +1,9 @@
++lvm2 (2.02.116-pve1) unstable; urgency=medium
+
-+ * New upstream release (fix for udev rules)
++ * New upstream version.
+
-+ -- Proxmox Support Team <support@proxmox.com> Tue, 13 Aug 2013 12:06:26 +0200
++ -- Proxmox Support Team <support@proxmox.com> Fri, 27 Feb 2015 11:27:16 +0100
+
-+lvm2 (2.02.95-pve3) unstable; urgency=low
-+
-+ * update to wheezy
-+
-+ -- Proxmox Support Team <support@proxmox.com> Thu, 14 Mar 2013 09:55:52 +0100
-+
-+lvm2 (2.02.95-2pve2) unstable; urgency=low
-+
-+ * fix udev rule priorities
-+
-+ -- Proxmox Support Team <support@proxmox.com> Fri, 27 Apr 2012 07:42:26 +0200
-+
-+lvm2 (2.02.95-1pve1) unstable; urgency=low
-+
-+ * update to latest available lvm 2.0.95
-+
-+ -- Proxmox Support Team <support@proxmox.com> Mon, 23 Apr 2012 07:54:36 +0200
-+
-+lvm2 (2.02.88-2pve2) unstable; urgency=low
-+
-+ * enable issue_discard in default lvm.conf
-+
-+ -- Proxmox Support Team <support@proxmox.com> Fri, 09 Mar 2012 09:56:19 +0100
-+
-+lvm2 (2.02.88-2pve1) unstable; urgency=low
-+
-+ * update to 2.02.88-2
-+
-+ -- Proxmox Support Team <support@proxmox.com> Fri, 09 Dec 2011 06:50:49 +0100
-+
-+lvm2 (2.02.86-1pve2) unstable; urgency=low
-+
-+ * disable clvmd by default
-+
-+ * do not set locking type automatically
-+
-+ -- Proxmox Support Team <support@proxmox.com> Fri, 25 Nov 2011 08:45:28 +0100
-+
-+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.98-5) unstable; urgency=low
+ lvm2 (2.02.111-2) unstable; urgency=medium
- * Fix udev rules.
+ * Install additional man-pages. (closes: #587277, #760679)
--- /dev/null
+Index: new/debian/libdevmapper1.02.1.symbols
+===================================================================
+--- new.orig/debian/libdevmapper1.02.1.symbols
++++ new/debian/libdevmapper1.02.1.symbols
+@@ -25,6 +25,7 @@ libdevmapper.so.1.02.1 libdevmapper1.02.
+ dm_config_find_node@Base 2:1.02.74
+ dm_config_find_str@Base 2:1.02.74
+ dm_config_find_str_allow_empty@Base 2:1.02.74
++ dm_config_flatten@Base 2:1.02.93
+ dm_config_from_string@Base 2:1.02.74
+ dm_config_get_custom@Base 2:1.02.74
+ dm_config_get_list@Base 2:1.02.74
+@@ -39,6 +40,7 @@ libdevmapper.so.1.02.1 libdevmapper1.02.
+ dm_config_parent_name@Base 2:1.02.74
+ dm_config_parse@Base 2:1.02.74
+ dm_config_remove_cascaded_tree@Base 2:1.02.74
++ dm_config_remove_node@Base 2:1.02.93
+ dm_config_set_custom@Base 2:1.02.74
+ dm_config_tree_find_bool@Base 2:1.02.74
+ dm_config_tree_find_float@Base 2:1.02.74
+@@ -144,6 +146,7 @@ libdevmapper.so.1.02.1 libdevmapper1.02.
+ dm_regex_create@Base 2:1.02.20
+ dm_regex_fingerprint@Base 2:1.02.63
+ dm_regex_match@Base 2:1.02.20
++ dm_report_compact_fields@Base 2:1.02.93
+ dm_report_field_int32@Base 2:1.02.27
+ dm_report_field_int@Base 2:1.02.27
+ dm_report_field_percent@Base 2:1.02.88
+@@ -259,6 +262,7 @@ libdevmapper.so.1.02.1 libdevmapper1.02.
+ dm_tree_node_set_read_ahead@Base 2:1.02.24
+ dm_tree_node_set_thin_external_origin@Base 2:1.02.77
+ dm_tree_node_set_thin_pool_discard@Base 2:1.02.77
++ dm_tree_node_set_thin_pool_error_if_no_space@Base 2:1.02.93
+ dm_tree_node_set_udev_flags@Base 2:1.02.74
+ dm_tree_node_size_changed@Base 2:1.02.36
+ dm_tree_preload_children@Base 2:1.02.20
--- /dev/null
+Index: new/debian/control
+===================================================================
+--- new.orig/debian/control
++++ new/debian/control
+@@ -3,7 +3,7 @@ Section: admin
+ Priority: optional
+ Maintainer: Debian LVM Team <pkg-lvm-maintainers@lists.alioth.debian.org>
+ Uploaders: Bastian Blank <waldi@debian.org>
+-Build-Depends: dpkg-dev (>= 1.16.1~), debhelper (>= 8.1.3~), dh-systemd, automake, libcman-dev (>> 2), libcorosync-dev, libdlm-dev (>> 2), libreadline-gplv2-dev, libselinux1-dev, libudev-dev, openais-dev, pkg-config
++Build-Depends: dpkg-dev (>= 1.16.1~), debhelper (>= 8.1.3~), dh-systemd, automake, libcorosync-pve-dev, libdlm-dev (>> 2), libreadline-gplv2-dev, libselinux1-dev, libudev-dev, pkg-config
+ Standards-Version: 3.9.5
+ Homepage: http://sources.redhat.com/lvm2/
+ Vcs-Svn: svn://svn.debian.org/pkg-lvm/lvm2/trunk/
+@@ -22,25 +22,11 @@ Description: Linux Logical Volume Manage
+ volume groups can be allocated to logical volumes, which are accessed as
+ regular block devices.
+
+-Package: lvm2-udeb
+-Package-Type: udeb
+-Section: debian-installer
+-Architecture: any
+-Depends: ${shlibs:Depends}, ${misc:Depends}
+-Description: Linux Logical Volume Manager
+- This is a udeb, or a microdeb, for the debian-installer.
+- .
+- This is LVM2, the rewrite of The Linux Logical Volume Manager. LVM
+- supports enterprise level volume management of disk and disk subsystems
+- by grouping arbitrary disks into volume groups. The total capacity of
+- volume groups can be allocated to logical volumes, which are accessed as
+- regular block devices.
+-
+ Package: clvm
+ Priority: extra
+ Architecture: any
+ Depends: ${shlibs:Depends}, ${misc:Depends}, lvm2 (= ${binary:Version}), lsb-base
+-Recommends: corosync | openais | cman
++Recommends: corosync-pve
+ Multi-Arch: foreign
+ Description: Cluster LVM Daemon for lvm2
+ This package provides the clustering interface for lvm2, when used with
+@@ -83,20 +69,6 @@ Description: Linux Kernel Device Mapper
+ device-mapper; it allows usage of the device-mapper through a clean,
+ consistent interface (as opposed to through kernel ioctls).
+
+-Package: libdevmapper1.02.1-udeb
+-Package-Type: udeb
+-Section: debian-installer
+-Architecture: any
+-Depends: ${shlibs:Depends}, ${misc:Depends}
+-Description: Linux Kernel Device Mapper userspace library
+- This is a udeb, or a microdeb, for the debian-installer.
+- .
+- The Linux Kernel Device Mapper is the LVM (Linux Logical Volume Management)
+- Team's implementation of a minimalistic kernel-space driver that handles
+- volume management, while keeping knowledge of the underlying device layout
+- in user-space. This makes it useful for not only LVM, but EVMS, software
+- raid, and other drivers that create "virtual" block devices.
+-
+ Package: dmsetup
+ Architecture: any
+ Depends: ${shlibs:Depends}, ${misc:Depends}, util-linux (>> 2.16)
+@@ -105,20 +77,6 @@ Multi-Arch: foreign
+ Description: Linux Kernel Device Mapper userspace library
+ The Linux Kernel Device Mapper is the LVM (Linux Logical Volume Management)
+ Team's implementation of a minimalistic kernel-space driver that handles
+- volume management, while keeping knowledge of the underlying device layout
+- in user-space. This makes it useful for not only LVM, but EVMS, software
+- raid, and other drivers that create "virtual" block devices.
+- .
+- This package contains a utility for modifying device mappings.
+-
+-Package: dmsetup-udeb
+-Package-Type: udeb
+-Section: debian-installer
+-Architecture: any
+-Depends: ${shlibs:Depends}, ${misc:Depends}
+-Description: Linux Kernel Device Mapper userspace library
+- The Linux Kernel Device Mapper is the LVM (Linux Logical Volume Management)
+- Team's implementation of a minimalistic kernel-space driver that handles
+ volume management, while keeping knowledge of the underlying device layout
+ in user-space. This makes it useful for not only LVM, but EVMS, software
+ raid, and other drivers that create "virtual" block devices.
+Index: new/debian/rules
+===================================================================
+--- new.orig/debian/rules
++++ new/debian/rules
+@@ -258,7 +258,7 @@ install_lvm2-udeb: $(STAMPS_DIR)/install
+ +$(MAKE_SELF) install-base
+
+ binary-indep:
+-binary-arch: $(addprefix install_,libdevmapper libdevmapper-udeb libdevmapper-event libdevmapper-dev dmsetup dmsetup-udeb dmeventd liblvm2 lvm2 lvm2-udeb clvm)
++binary-arch: $(addprefix install_,libdevmapper libdevmapper-event libdevmapper-dev dmsetup dmeventd liblvm2 lvm2 clvm)
+
+ binary: binary-indep binary-arch
+
-#re-enable-clvm.patch
-fix-build-dependencies.patch
+##re-enable-clvm.patch
+#fix-build-dependencies.patch
+#fix-changelog.patch
+##fix-fsadm-install.patch
+#remove-udebs.patch
+##autodetect-locking-type.patch
+##suppress-error-messages.patch
+#enable-issue-discard.patch
+##allow-new-symbols.patch
+##fix-udev-rules.patch
+#fix-clvm-init.patch
+jessie-remove-udebs.patch
+configure-with-corosync2.patch
fix-changelog.patch
-#fix-fsadm-install.patch
-remove-udebs.patch
-#autodetect-locking-type.patch
-#suppress-error-messages.patch
-enable-issue-discard.patch
-#allow-new-symbols.patch
-#fix-udev-rules.patch
-fix-clvm-init.patch
+fix-symbols.patch
projects / lvm.git / commitdiff