From e8d0c874f6d973f509806f94abed096791e829c7dc461bd108759822a28cbefc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 10 Apr 2017 10:37:58 +0000 Subject: [PATCH 1/7] - Add the dlm_version and sandlock_version to common defs, to be used later on - Add the dlm_version and sandlock_version to common defs, to be used later on - Add the dlm_version and sandlock_version to common defs, to be used later on OBS-URL: https://build.opensuse.org/package/show/Base:System/lvm2?expand=0&rev=172 --- device-mapper.changes | 6 ++++++ device-mapper.spec | 2 ++ lvm2-clvm.changes | 6 ++++++ lvm2-clvm.spec | 2 ++ lvm2.changes | 6 ++++++ lvm2.spec | 2 ++ 6 files changed, 24 insertions(+) diff --git a/device-mapper.changes b/device-mapper.changes index fe4a3b6..666d1b6 100644 --- a/device-mapper.changes +++ b/device-mapper.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Apr 10 10:36:41 UTC 2017 - tchvatal@suse.com + +- Add the dlm_version and sandlock_version to common defs, to be + used later on + ------------------------------------------------------------------- Fri Feb 24 10:57:16 UTC 2017 - zren@suse.com diff --git a/device-mapper.spec b/device-mapper.spec index 9b85f3b..08ce919 100644 --- a/device-mapper.spec +++ b/device-mapper.spec @@ -20,6 +20,8 @@ %define lvm2_version 2.02.168 %define device_mapper_version 1.02.137 %define thin_provisioning_version 0.5.6 +%define dlm_version 3.99.1 +%define sanlock_version 3.3.0 ### COMMON-DEF-END ### %define libname libdevmapper1_03 diff --git a/lvm2-clvm.changes b/lvm2-clvm.changes index fe4a3b6..666d1b6 100644 --- a/lvm2-clvm.changes +++ b/lvm2-clvm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Apr 10 10:36:41 UTC 2017 - tchvatal@suse.com + +- Add the dlm_version and sandlock_version to common defs, to be + used later on + ------------------------------------------------------------------- Fri Feb 24 10:57:16 UTC 2017 - zren@suse.com diff --git a/lvm2-clvm.spec b/lvm2-clvm.spec index fbbcd42..f9d41fd 100644 --- a/lvm2-clvm.spec +++ b/lvm2-clvm.spec @@ -20,6 +20,8 @@ %define lvm2_version 2.02.168 %define device_mapper_version 1.02.137 %define thin_provisioning_version 0.5.6 +%define dlm_version 3.99.1 +%define sanlock_version 3.3.0 ### COMMON-DEF-END ### Name: lvm2-clvm diff --git a/lvm2.changes b/lvm2.changes index fe4a3b6..666d1b6 100644 --- a/lvm2.changes +++ b/lvm2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Apr 10 10:36:41 UTC 2017 - tchvatal@suse.com + +- Add the dlm_version and sandlock_version to common defs, to be + used later on + ------------------------------------------------------------------- Fri Feb 24 10:57:16 UTC 2017 - zren@suse.com diff --git a/lvm2.spec b/lvm2.spec index 8ae5b30..6367cf1 100644 --- a/lvm2.spec +++ b/lvm2.spec @@ -20,6 +20,8 @@ %define lvm2_version 2.02.168 %define device_mapper_version 1.02.137 %define thin_provisioning_version 0.5.6 +%define dlm_version 3.99.1 +%define sanlock_version 3.3.0 ### COMMON-DEF-END ### %define _udevdir %(pkg-config --variable=udevdir udev) From cc9b493fe95b0bb88117339ac01c6fb0811f7410a26f5619c72b01f582b99ef3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 10 Apr 2017 10:40:22 +0000 Subject: [PATCH 2/7] - Pass over with spec-cleaner - Pass over with spec-cleaner - Pass over with spec-cleaner OBS-URL: https://build.opensuse.org/package/show/Base:System/lvm2?expand=0&rev=173 --- device-mapper.changes | 5 ++ device-mapper.spec | 41 +++++----- lvm2-clvm.changes | 5 ++ lvm2-clvm.spec | 32 ++++---- lvm2.changes | 5 ++ lvm2.spec | 170 +++++++++++++++++++++--------------------- 6 files changed, 135 insertions(+), 123 deletions(-) diff --git a/device-mapper.changes b/device-mapper.changes index 666d1b6..6c488b6 100644 --- a/device-mapper.changes +++ b/device-mapper.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Apr 10 10:39:41 UTC 2017 - tchvatal@suse.com + +- Pass over with spec-cleaner + ------------------------------------------------------------------- Mon Apr 10 10:36:41 UTC 2017 - tchvatal@suse.com diff --git a/device-mapper.spec b/device-mapper.spec index 08ce919..f5cbaff 100644 --- a/device-mapper.spec +++ b/device-mapper.spec @@ -16,6 +16,8 @@ # +%define libname libdevmapper1_03 +%define libname_event libdevmapper-event1_03 ### COMMON-DEF-BEGIN ### %define lvm2_version 2.02.168 %define device_mapper_version 1.02.137 @@ -23,10 +25,6 @@ %define dlm_version 3.99.1 %define sanlock_version 3.3.0 ### COMMON-DEF-END ### - -%define libname libdevmapper1_03 -%define libname_event libdevmapper-event1_03 - Name: device-mapper Version: %{device_mapper_version} Release: 0 @@ -37,7 +35,18 @@ Url: http://www.sourceware.org/lvm2/ Source: ftp://sources.redhat.com/pub/lvm2/LVM2.%{lvm2_version}.tgz Source1: ftp://sources.redhat.com/pub/lvm2/LVM2.%{lvm2_version}.tgz.asc Source99: baselibs.conf - +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: suse-module-tools +BuildRequires: thin-provisioning-tools >= %{thin_provisioning_version} +BuildRequires: pkgconfig(libselinux) +BuildRequires: pkgconfig(libsepol) +BuildRequires: pkgconfig(libudev) +BuildRequires: pkgconfig(systemd) +Requires: thin-provisioning-tools >= %{thin_provisioning_version} +Requires(post): coreutils +BuildRoot: %{_tmppath}/%{name}-%{version}-build +%{?systemd_requires} ### COMMON-PATCH-BEGIN ### # Upstream patches # SUSE patches: 1000+ for LVM, 2000+ for device mapper @@ -95,19 +104,6 @@ Patch2011: lvm2-testsuite.patch Patch2012: simplify-special-case-for-md-in-69-dm-lvm-metadata.patch ### COMMON-PATCH-END ### -BuildRequires: gcc-c++ -BuildRequires: pkgconfig -BuildRequires: suse-module-tools -BuildRequires: thin-provisioning-tools >= %{thin_provisioning_version} -BuildRequires: pkgconfig(libselinux) -BuildRequires: pkgconfig(libsepol) -BuildRequires: pkgconfig(libudev) -BuildRequires: pkgconfig(systemd) -Requires: thin-provisioning-tools >= %{thin_provisioning_version} -Requires(post): coreutils -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%{?systemd_requires} - %description Programs and man pages for configuring and using the device mapper. @@ -225,9 +221,9 @@ ln -s %{_sbindir}/dmsetup %{buildroot}/sbin/dmsetup %{_sbindir}/dmsetup %{_sbindir}/dmeventd %{_sbindir}/dmstats -%{_mandir}/man8/dmstats.8.* -%{_mandir}/man8/dmsetup.8.* -%{_mandir}/man8/dmeventd.8.* +%{_mandir}/man8/dmstats.8%{ext_man} +%{_mandir}/man8/dmsetup.8%{ext_man} +%{_mandir}/man8/dmeventd.8%{ext_man} %{_udevrulesdir}/10-dm.rules %{_udevrulesdir}/13-dm-disk.rules %{_udevrulesdir}/95-dm-notify.rules @@ -238,6 +234,7 @@ ln -s %{_sbindir}/dmsetup %{buildroot}/sbin/dmsetup ############################################################################## # Library for device-mapper ############################################################################## + %package -n %{libname} Summary: Library for device-mapper Group: System/Libraries @@ -257,6 +254,7 @@ Device mapper main shared library ############################################################################## # Event library for device-mapper ############################################################################## + %package -n %{libname_event} Summary: Event library for device-mapper Group: System/Libraries @@ -276,6 +274,7 @@ Device mapper event daemon shared library ############################################################################## # Development package for the device mapper ############################################################################## + %package devel Summary: Development package for the device mapper Group: Development/Libraries/C and C++ diff --git a/lvm2-clvm.changes b/lvm2-clvm.changes index 666d1b6..6c488b6 100644 --- a/lvm2-clvm.changes +++ b/lvm2-clvm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Apr 10 10:39:41 UTC 2017 - tchvatal@suse.com + +- Pass over with spec-cleaner + ------------------------------------------------------------------- Mon Apr 10 10:36:41 UTC 2017 - tchvatal@suse.com diff --git a/lvm2-clvm.spec b/lvm2-clvm.spec index f9d41fd..2f753c4 100644 --- a/lvm2-clvm.spec +++ b/lvm2-clvm.spec @@ -23,7 +23,6 @@ %define dlm_version 3.99.1 %define sanlock_version 3.3.0 ### COMMON-DEF-END ### - Name: lvm2-clvm Version: %{lvm2_version} Release: 0 @@ -35,7 +34,18 @@ Source: ftp://sources.redhat.com/pub/lvm2/LVM2.%{lvm2_version}.tgz Source1: ftp://sources.redhat.com/pub/lvm2/LVM2.%{lvm2_version}.tgz.asc Source2: clvmd.ocf Source3: cmirrord.ocf - +BuildRequires: libcorosync-devel +BuildRequires: libdlm-devel +BuildRequires: pkgconfig +BuildRequires: thin-provisioning-tools >= %{thin_provisioning_version} +BuildRequires: pkgconfig(devmapper) +BuildRequires: pkgconfig(libudev) +Requires: corosync +Requires: device-mapper >= %{device_mapper_version} +Requires: lvm2 = %{version} +Requires: lvm2-cmirrord +Obsoletes: cmirrord < %{version} +Provides: cmirrord = %{version} ### COMMON-PATCH-BEGIN ### # Upstream patches # SUSE patches: 1000+ for LVM, 2000+ for device mapper @@ -93,19 +103,6 @@ Patch2011: lvm2-testsuite.patch Patch2012: simplify-special-case-for-md-in-69-dm-lvm-metadata.patch ### COMMON-PATCH-END ### -BuildRequires: libcorosync-devel -BuildRequires: libdlm-devel -BuildRequires: pkgconfig -BuildRequires: thin-provisioning-tools >= %{thin_provisioning_version} -BuildRequires: pkgconfig(devmapper) -BuildRequires: pkgconfig(libudev) -Requires: corosync -Requires: device-mapper >= %{device_mapper_version} -Requires: lvm2 = %{version} -Requires: lvm2-cmirrord -Obsoletes: cmirrord < %{version} -Provides: cmirrord = %{version} - %description A daemon for using LVM2 Logival Volumes in a clustered environment. @@ -216,11 +213,12 @@ rm %{buildroot}%{_mandir}/man8/lvm2-activation-generator.8 %{_unitdir}/lvm2-clvmd.service %{_unitdir}/lvm2-cluster-activation.service %{_libexecdir}/systemd/lvm2-cluster-activation -%{_mandir}/man8/clvmd.8.gz +%{_mandir}/man8/clvmd.8%{ext_man} ############################################################################## # Clustered RAID 1 support using device-mapper and corosync ############################################################################## + %package -n lvm2-cmirrord Summary: Clustered RAID 1 support using device-mapper and corosync Group: Productivity/Clustering/HA @@ -238,6 +236,6 @@ A daemon for using LVM2 Logival Volumes in a clustered environment. %{_libexecdir}/ocf/resource.d/lvm2/cmirrord %{_libexecdir}/systemd/system/lvm2-cmirrord.service %{_sbindir}/rclvm2-cmirrord -%{_mandir}/man8/cmirrord.8.* +%{_mandir}/man8/cmirrord.8%{ext_man} %changelog diff --git a/lvm2.changes b/lvm2.changes index 666d1b6..6c488b6 100644 --- a/lvm2.changes +++ b/lvm2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Apr 10 10:39:41 UTC 2017 - tchvatal@suse.com + +- Pass over with spec-cleaner + ------------------------------------------------------------------- Mon Apr 10 10:36:41 UTC 2017 - tchvatal@suse.com diff --git a/lvm2.spec b/lvm2.spec index 6367cf1..dcaa55b 100644 --- a/lvm2.spec +++ b/lvm2.spec @@ -16,6 +16,9 @@ # +%define _udevdir %(pkg-config --variable=udevdir udev) +%define applib liblvm2app2_2 +%define cmdlib liblvm2cmd2_02 ### COMMON-DEF-BEGIN ### %define lvm2_version 2.02.168 %define device_mapper_version 1.02.137 @@ -23,11 +26,6 @@ %define dlm_version 3.99.1 %define sanlock_version 3.3.0 ### COMMON-DEF-END ### - -%define _udevdir %(pkg-config --variable=udevdir udev) -%define applib liblvm2app2_2 -%define cmdlib liblvm2cmd2_02 - Name: lvm2 Version: %{lvm2_version} Release: 0 @@ -38,7 +36,22 @@ Url: http://www.sourceware.org/lvm2/ Source: ftp://sources.redhat.com/pub/lvm2/LVM2.%{version}.tgz Source1: lvm.conf Source42: ftp://sources.redhat.com/pub/lvm2/LVM2.%{version}.tgz.asc - +BuildRequires: gcc-c++ +BuildRequires: libaio-devel +BuildRequires: libselinux-devel +BuildRequires: pkgconfig +BuildRequires: readline-devel +BuildRequires: thin-provisioning-tools >= %{thin_provisioning_version} +BuildRequires: pkgconfig(blkid) +BuildRequires: pkgconfig(libudev) +BuildRequires: pkgconfig(systemd) +BuildRequires: pkgconfig(udev) +Requires: device-mapper >= %{device_mapper_version} +Requires(post): coreutils +Requires(postun): coreutils +Provides: lvm = %{version} +BuildRoot: %{_tmppath}/%{name}-%{version}-build +%{?systemd_requires} ### COMMON-PATCH-BEGIN ### # Upstream patches # SUSE patches: 1000+ for LVM, 2000+ for device mapper @@ -96,23 +109,6 @@ Patch2011: lvm2-testsuite.patch Patch2012: simplify-special-case-for-md-in-69-dm-lvm-metadata.patch ### COMMON-PATCH-END ### -BuildRequires: gcc-c++ -BuildRequires: libaio-devel -BuildRequires: libselinux-devel -BuildRequires: pkgconfig -BuildRequires: readline-devel -BuildRequires: thin-provisioning-tools >= %{thin_provisioning_version} -BuildRequires: pkgconfig(blkid) -BuildRequires: pkgconfig(libudev) -BuildRequires: pkgconfig(systemd) -BuildRequires: pkgconfig(udev) -Requires: device-mapper >= %{device_mapper_version} -Requires(post): coreutils -Requires(postun): coreutils -Provides: lvm = %{version} -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%{?systemd_requires} - %description Programs and man pages for configuring and using the LVM2 Logical Volume Manager. @@ -372,67 +368,67 @@ popd /sbin/vgs /sbin/vgscan /sbin/vgsplit -%{_mandir}/man5/lvm.conf.5.gz -%{_mandir}/man7/lvmcache.7.gz -%{_mandir}/man7/lvmraid.7.gz -%{_mandir}/man7/lvmreport.7.gz -%{_mandir}/man7/lvmthin.7.gz -%{_mandir}/man7/lvmsystemid.7.gz -%{_mandir}/man8/fsadm.8.gz -%{_mandir}/man8/lvchange.8.gz -%{_mandir}/man8/lvconvert.8.gz -%{_mandir}/man8/lvcreate.8.gz -%{_mandir}/man8/lvdisplay.8.gz -%{_mandir}/man8/lvextend.8.gz -%{_mandir}/man8/lvm.8.gz -%{_mandir}/man8/lvm2-activation-generator.8.gz -%{_mandir}/man8/lvm-config.8.gz -%{_mandir}/man8/lvmconfig.8.gz -%{_mandir}/man8/lvm-dumpconfig.8.gz -%{_mandir}/man8/lvmchange.8.gz -%{_mandir}/man8/lvmconf.8.gz -%{_mandir}/man8/lvmdiskscan.8.gz -%{_mandir}/man8/lvmdump.8.gz -%{_mandir}/man8/lvm-fullreport.8.gz -%{_mandir}/man8/lvmsadc.8.gz -%{_mandir}/man8/lvmsar.8.gz -%{_mandir}/man8/lvreduce.8.gz -%{_mandir}/man8/lvremove.8.gz -%{_mandir}/man8/lvrename.8.gz -%{_mandir}/man8/lvresize.8.gz -%{_mandir}/man8/lvs.8.gz -%{_mandir}/man8/lvscan.8.gz -%{_mandir}/man8/pvchange.8.gz -%{_mandir}/man8/pvck.8.gz -%{_mandir}/man8/pvcreate.8.gz -%{_mandir}/man8/pvdisplay.8.gz -%{_mandir}/man8/pvmove.8.gz -%{_mandir}/man8/pvremove.8.gz -%{_mandir}/man8/pvresize.8.gz -%{_mandir}/man8/pvs.8.gz -%{_mandir}/man8/pvscan.8.gz -%{_mandir}/man8/vgcfgbackup.8.gz -%{_mandir}/man8/vgcfgrestore.8.gz -%{_mandir}/man8/vgchange.8.gz -%{_mandir}/man8/vgck.8.gz -%{_mandir}/man8/vgconvert.8.gz -%{_mandir}/man8/vgcreate.8.gz -%{_mandir}/man8/vgdisplay.8.gz -%{_mandir}/man8/vgexport.8.gz -%{_mandir}/man8/vgextend.8.gz -%{_mandir}/man8/vgimport.8.gz -%{_mandir}/man8/vgimportclone.8.gz -%{_mandir}/man8/vgmerge.8.gz -%{_mandir}/man8/vgmknodes.8.gz -%{_mandir}/man8/vgreduce.8.gz -%{_mandir}/man8/vgremove.8.gz -%{_mandir}/man8/vgrename.8.gz -%{_mandir}/man8/vgs.8.gz -%{_mandir}/man8/vgscan.8.gz -%{_mandir}/man8/vgsplit.8.gz -%{_mandir}/man8/lvmetad.8.gz -%{_mandir}/man8/lvm-lvpoll.8.gz -%{_mandir}/man8/blkdeactivate.8.gz +%{_mandir}/man5/lvm.conf.5%{ext_man} +%{_mandir}/man7/lvmcache.7%{ext_man} +%{_mandir}/man7/lvmraid.7%{ext_man} +%{_mandir}/man7/lvmreport.7%{ext_man} +%{_mandir}/man7/lvmthin.7%{ext_man} +%{_mandir}/man7/lvmsystemid.7%{ext_man} +%{_mandir}/man8/fsadm.8%{ext_man} +%{_mandir}/man8/lvchange.8%{ext_man} +%{_mandir}/man8/lvconvert.8%{ext_man} +%{_mandir}/man8/lvcreate.8%{ext_man} +%{_mandir}/man8/lvdisplay.8%{ext_man} +%{_mandir}/man8/lvextend.8%{ext_man} +%{_mandir}/man8/lvm.8%{ext_man} +%{_mandir}/man8/lvm2-activation-generator.8%{ext_man} +%{_mandir}/man8/lvm-config.8%{ext_man} +%{_mandir}/man8/lvmconfig.8%{ext_man} +%{_mandir}/man8/lvm-dumpconfig.8%{ext_man} +%{_mandir}/man8/lvmchange.8%{ext_man} +%{_mandir}/man8/lvmconf.8%{ext_man} +%{_mandir}/man8/lvmdiskscan.8%{ext_man} +%{_mandir}/man8/lvmdump.8%{ext_man} +%{_mandir}/man8/lvm-fullreport.8%{ext_man} +%{_mandir}/man8/lvmsadc.8%{ext_man} +%{_mandir}/man8/lvmsar.8%{ext_man} +%{_mandir}/man8/lvreduce.8%{ext_man} +%{_mandir}/man8/lvremove.8%{ext_man} +%{_mandir}/man8/lvrename.8%{ext_man} +%{_mandir}/man8/lvresize.8%{ext_man} +%{_mandir}/man8/lvs.8%{ext_man} +%{_mandir}/man8/lvscan.8%{ext_man} +%{_mandir}/man8/pvchange.8%{ext_man} +%{_mandir}/man8/pvck.8%{ext_man} +%{_mandir}/man8/pvcreate.8%{ext_man} +%{_mandir}/man8/pvdisplay.8%{ext_man} +%{_mandir}/man8/pvmove.8%{ext_man} +%{_mandir}/man8/pvremove.8%{ext_man} +%{_mandir}/man8/pvresize.8%{ext_man} +%{_mandir}/man8/pvs.8%{ext_man} +%{_mandir}/man8/pvscan.8%{ext_man} +%{_mandir}/man8/vgcfgbackup.8%{ext_man} +%{_mandir}/man8/vgcfgrestore.8%{ext_man} +%{_mandir}/man8/vgchange.8%{ext_man} +%{_mandir}/man8/vgck.8%{ext_man} +%{_mandir}/man8/vgconvert.8%{ext_man} +%{_mandir}/man8/vgcreate.8%{ext_man} +%{_mandir}/man8/vgdisplay.8%{ext_man} +%{_mandir}/man8/vgexport.8%{ext_man} +%{_mandir}/man8/vgextend.8%{ext_man} +%{_mandir}/man8/vgimport.8%{ext_man} +%{_mandir}/man8/vgimportclone.8%{ext_man} +%{_mandir}/man8/vgmerge.8%{ext_man} +%{_mandir}/man8/vgmknodes.8%{ext_man} +%{_mandir}/man8/vgreduce.8%{ext_man} +%{_mandir}/man8/vgremove.8%{ext_man} +%{_mandir}/man8/vgrename.8%{ext_man} +%{_mandir}/man8/vgs.8%{ext_man} +%{_mandir}/man8/vgscan.8%{ext_man} +%{_mandir}/man8/vgsplit.8%{ext_man} +%{_mandir}/man8/lvmetad.8%{ext_man} +%{_mandir}/man8/lvm-lvpoll.8%{ext_man} +%{_mandir}/man8/blkdeactivate.8%{ext_man} %{_udevdir}/rules.d/11-dm-lvm.rules %{_udevdir}/rules.d/69-dm-lvm-metad.rules %dir %{_sysconfdir}/lvm @@ -467,6 +463,7 @@ popd ############################################################################## # LVM2 application api library ############################################################################## + %package -n %{applib} Summary: LVM2 application api library Group: System/Libraries @@ -485,6 +482,7 @@ LVM library for applications api ############################################################################## # LVM2 command line library ############################################################################## + %package -n %{cmdlib} Summary: LVM2 command line library Group: System/Libraries @@ -504,6 +502,7 @@ lvm devices without invoking a separate program. ############################################################################## # Development files for LVM2 ############################################################################## + %package devel Summary: Development files for LVM2 Group: Development/Libraries/C and C++ @@ -524,8 +523,9 @@ This package provides development files for the LVM2 Logical Volume Manager. %{_libdir}/liblvm2cmd.so ############################################################################## -# LVM2 Testsuite +# LVM2 Testsuite ############################################################################## + %package testsuite Summary: LVM2 Testsuite Group: Development/Libraries/C and C++ From a6cb4fc87dbd2e4e81192791845ebb0659ab9ba39fbef0996cec570486a2766c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 10 Apr 2017 10:41:54 +0000 Subject: [PATCH 3/7] - Split configure options to have one per line - Split configure options to have one per line - Split configure options to have one per line OBS-URL: https://build.opensuse.org/package/show/Base:System/lvm2?expand=0&rev=174 --- device-mapper.changes | 7 ++----- device-mapper.spec | 6 ++++-- lvm2-clvm.changes | 7 ++----- lvm2-clvm.spec | 6 ++++-- lvm2.changes | 7 ++----- lvm2.spec | 6 ++++-- 6 files changed, 18 insertions(+), 21 deletions(-) diff --git a/device-mapper.changes b/device-mapper.changes index 6c488b6..2eaac4a 100644 --- a/device-mapper.changes +++ b/device-mapper.changes @@ -1,11 +1,8 @@ ------------------------------------------------------------------- -Mon Apr 10 10:39:41 UTC 2017 - tchvatal@suse.com +Mon Apr 10 10:41:02 UTC 2017 - tchvatal@suse.com +- Split configure options to have one per line - Pass over with spec-cleaner - -------------------------------------------------------------------- -Mon Apr 10 10:36:41 UTC 2017 - tchvatal@suse.com - - Add the dlm_version and sandlock_version to common defs, to be used later on diff --git a/device-mapper.spec b/device-mapper.spec index f5cbaff..d3d0bc7 100644 --- a/device-mapper.spec +++ b/device-mapper.spec @@ -150,8 +150,10 @@ extra_opts="" export PATH=$PATH:/sbin:%{_prefix}/sbin sed -ie "s/%{device_mapper_version}/1.03.01/g" VERSION_DM %configure \ - --enable-dmeventd --enable-cmdlib \ - --enable-udev_rules --enable-udev_sync \ + --enable-dmeventd \ + --enable-cmdlib \ + --enable-udev_rules \ + --enable-udev_sync \ --with-udev-prefix="%{_prefix}/" \ --enable-selinux \ --enable-pkgconfig \ diff --git a/lvm2-clvm.changes b/lvm2-clvm.changes index 6c488b6..2eaac4a 100644 --- a/lvm2-clvm.changes +++ b/lvm2-clvm.changes @@ -1,11 +1,8 @@ ------------------------------------------------------------------- -Mon Apr 10 10:39:41 UTC 2017 - tchvatal@suse.com +Mon Apr 10 10:41:02 UTC 2017 - tchvatal@suse.com +- Split configure options to have one per line - Pass over with spec-cleaner - -------------------------------------------------------------------- -Mon Apr 10 10:36:41 UTC 2017 - tchvatal@suse.com - - Add the dlm_version and sandlock_version to common defs, to be used later on diff --git a/lvm2-clvm.spec b/lvm2-clvm.spec index 2f753c4..8550b88 100644 --- a/lvm2-clvm.spec +++ b/lvm2-clvm.spec @@ -157,8 +157,10 @@ extra_opts=" export PATH=$PATH:/sbin:%{_prefix}/sbin sed -ie "s/%{device_mapper_version}/1.03.01/g" VERSION_DM %configure \ - --enable-dmeventd --enable-cmdlib \ - --enable-udev_rules --enable-udev_sync \ + --enable-dmeventd \ + --enable-cmdlib \ + --enable-udev_rules \ + --enable-udev_sync \ --with-udev-prefix="%{_prefix}/" \ --enable-selinux \ --enable-pkgconfig \ diff --git a/lvm2.changes b/lvm2.changes index 6c488b6..2eaac4a 100644 --- a/lvm2.changes +++ b/lvm2.changes @@ -1,11 +1,8 @@ ------------------------------------------------------------------- -Mon Apr 10 10:39:41 UTC 2017 - tchvatal@suse.com +Mon Apr 10 10:41:02 UTC 2017 - tchvatal@suse.com +- Split configure options to have one per line - Pass over with spec-cleaner - -------------------------------------------------------------------- -Mon Apr 10 10:36:41 UTC 2017 - tchvatal@suse.com - - Add the dlm_version and sandlock_version to common defs, to be used later on diff --git a/lvm2.spec b/lvm2.spec index dcaa55b..7f7e2b2 100644 --- a/lvm2.spec +++ b/lvm2.spec @@ -165,8 +165,10 @@ extra_opts=" export PATH=$PATH:/sbin:%{_prefix}/sbin sed -ie "s/%{device_mapper_version}/1.03.01/g" VERSION_DM %configure \ - --enable-dmeventd --enable-cmdlib \ - --enable-udev_rules --enable-udev_sync \ + --enable-dmeventd \ + --enable-cmdlib \ + --enable-udev_rules \ + --enable-udev_sync \ --with-udev-prefix="%{_prefix}/" \ --enable-selinux \ --enable-pkgconfig \ From 89857ea4f651bfcadcb816e87f0976e6a28367b0fd7800f919d2471044466c0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 10 Apr 2017 11:01:31 +0000 Subject: [PATCH 4/7] - Enable internal cache - Enable lvmpolld - Enable internal cache - Enable lvmpolld - Enable internal cache - Enable lvmpolld OBS-URL: https://build.opensuse.org/package/show/Base:System/lvm2?expand=0&rev=175 --- device-mapper.changes | 4 ++-- device-mapper.spec | 2 -- lvm2-clvm.changes | 4 ++-- lvm2-clvm.spec | 2 -- lvm2.changes | 4 ++-- lvm2.spec | 25 ++++++++++++++++--------- 6 files changed, 22 insertions(+), 19 deletions(-) diff --git a/device-mapper.changes b/device-mapper.changes index 2eaac4a..c252484 100644 --- a/device-mapper.changes +++ b/device-mapper.changes @@ -3,8 +3,8 @@ Mon Apr 10 10:41:02 UTC 2017 - tchvatal@suse.com - Split configure options to have one per line - Pass over with spec-cleaner -- Add the dlm_version and sandlock_version to common defs, to be - used later on +- Enable internal cache +- Enable lvmpolld ------------------------------------------------------------------- Fri Feb 24 10:57:16 UTC 2017 - zren@suse.com diff --git a/device-mapper.spec b/device-mapper.spec index d3d0bc7..3a6c41b 100644 --- a/device-mapper.spec +++ b/device-mapper.spec @@ -22,8 +22,6 @@ %define lvm2_version 2.02.168 %define device_mapper_version 1.02.137 %define thin_provisioning_version 0.5.6 -%define dlm_version 3.99.1 -%define sanlock_version 3.3.0 ### COMMON-DEF-END ### Name: device-mapper Version: %{device_mapper_version} diff --git a/lvm2-clvm.changes b/lvm2-clvm.changes index 2eaac4a..c252484 100644 --- a/lvm2-clvm.changes +++ b/lvm2-clvm.changes @@ -3,8 +3,8 @@ Mon Apr 10 10:41:02 UTC 2017 - tchvatal@suse.com - Split configure options to have one per line - Pass over with spec-cleaner -- Add the dlm_version and sandlock_version to common defs, to be - used later on +- Enable internal cache +- Enable lvmpolld ------------------------------------------------------------------- Fri Feb 24 10:57:16 UTC 2017 - zren@suse.com diff --git a/lvm2-clvm.spec b/lvm2-clvm.spec index 8550b88..4df50ce 100644 --- a/lvm2-clvm.spec +++ b/lvm2-clvm.spec @@ -20,8 +20,6 @@ %define lvm2_version 2.02.168 %define device_mapper_version 1.02.137 %define thin_provisioning_version 0.5.6 -%define dlm_version 3.99.1 -%define sanlock_version 3.3.0 ### COMMON-DEF-END ### Name: lvm2-clvm Version: %{lvm2_version} diff --git a/lvm2.changes b/lvm2.changes index 2eaac4a..c252484 100644 --- a/lvm2.changes +++ b/lvm2.changes @@ -3,8 +3,8 @@ Mon Apr 10 10:41:02 UTC 2017 - tchvatal@suse.com - Split configure options to have one per line - Pass over with spec-cleaner -- Add the dlm_version and sandlock_version to common defs, to be - used later on +- Enable internal cache +- Enable lvmpolld ------------------------------------------------------------------- Fri Feb 24 10:57:16 UTC 2017 - zren@suse.com diff --git a/lvm2.spec b/lvm2.spec index 7f7e2b2..5cb5c6d 100644 --- a/lvm2.spec +++ b/lvm2.spec @@ -23,8 +23,6 @@ %define lvm2_version 2.02.168 %define device_mapper_version 1.02.137 %define thin_provisioning_version 0.5.6 -%define dlm_version 3.99.1 -%define sanlock_version 3.3.0 ### COMMON-DEF-END ### Name: lvm2 Version: %{lvm2_version} @@ -151,11 +149,13 @@ Volume Manager. %build extra_opts=" + --enable-applib --enable-blkid_wiping --enable-cmdlib - --enable-applib - --enable-realtime --enable-lvmetad + --enable-lvmpolld + --enable-realtime + --with-cache=internal --with-default-locking-dir=/run/lock/lvm --with-default-pid-dir=/run --with-default-run-dir=/run/lvm @@ -213,6 +213,7 @@ popd ln -s service %{buildroot}%{_sbindir}/rcblk-availability ln -s service %{buildroot}%{_sbindir}/rclvm2-lvmetad ln -s service %{buildroot}%{_sbindir}/rclvm2-monitor +ln -s service %{buildroot}%{_sbindir}/rclvm2-lvmpolld # Remove devicemapper binaries, plain rm so we fail if something change rm %{buildroot}%{_sbindir}/dmsetup @@ -242,12 +243,12 @@ done popd %pre -%service_add_pre blk-availability.service lvm2-monitor.service lvm2-lvmetad.socket lvm2-lvmetad.service +%service_add_pre blk-availability.service lvm2-monitor.service lvm2-lvmetad.socket lvm2-lvmetad.service lvm2-lvmpolld.service lvm2-lvmpolld.socket %post /sbin/ldconfig %{?regenerate_initrd_post} -%service_add_post blk-availability.service lvm2-monitor.service lvm2-lvmetad.socket lvm2-lvmetad.service +%service_add_post blk-availability.service lvm2-monitor.service lvm2-lvmetad.socket lvm2-lvmetad.service lvm2-lvmpolld.service lvm2-lvmpolld.socket # Use %%tmpfiles_create when 13.2 is oldest in support scope %{_bindir}/systemd-tmpfiles --create %{_tmpfilesdir}/lvm2.conf || : @@ -255,12 +256,12 @@ popd %{?regenerate_initrd_posttrans} %preun -%service_del_preun blk-availability.service lvm2-monitor.service lvm2-lvmetad.service +%service_del_preun blk-availability.service lvm2-monitor.service lvm2-lvmetad.service lvm2-lvmpolld.service lvm2-lvmpolld.socket %postun /sbin/ldconfig %{?regenerate_initrd_post} -%service_del_postun blk-availability.service lvm2-monitor.service lvm2-lvmetad.service +%service_del_postun blk-availability.service lvm2-monitor.service lvm2-lvmetad.service lvm2-lvmpolld.service lvm2-lvmpolld.socket %files %defattr(-,root,root) @@ -274,6 +275,7 @@ popd %{_sbindir}/lvmconfig %{_sbindir}/lvmdump %{_sbindir}/lvmetad +%{_sbindir}/lvmpolld # Other files %{_sbindir}/lvchange %{_sbindir}/lvconvert @@ -320,6 +322,7 @@ popd %{_sbindir}/vgsplit %{_sbindir}/rcblk-availability %{_sbindir}/rclvm2-lvmetad +%{_sbindir}/rclvm2-lvmpolld %{_sbindir}/rclvm2-monitor # compat symlinks in /sbin /sbin/lvm @@ -327,6 +330,7 @@ popd /sbin/lvmconfig /sbin/lvmdump /sbin/lvmetad +/sbin/lvmpolld /sbin/lvchange /sbin/lvconvert /sbin/lvcreate @@ -429,8 +433,9 @@ popd %{_mandir}/man8/vgscan.8%{ext_man} %{_mandir}/man8/vgsplit.8%{ext_man} %{_mandir}/man8/lvmetad.8%{ext_man} -%{_mandir}/man8/lvm-lvpoll.8%{ext_man} %{_mandir}/man8/blkdeactivate.8%{ext_man} +%{_mandir}/man8/lvmpolld.8%{ext_man} +%{_mandir}/man8/lvm-lvpoll.8%{ext_man} %{_udevdir}/rules.d/11-dm-lvm.rules %{_udevdir}/rules.d/69-dm-lvm-metad.rules %dir %{_sysconfdir}/lvm @@ -456,6 +461,8 @@ popd %{_unitdir}/lvm2-lvmetad.socket %{_unitdir}/lvm2-lvmetad.service %{_unitdir}/lvm2-pvscan@.service +%{_unitdir}/lvm2-lvmpolld.socket +%{_unitdir}/lvm2-lvmpolld.service %{_prefix}/lib/systemd/system-generators/lvm2-activation-generator %dir %{_libdir}/device-mapper %{_libdir}/device-mapper/libdevmapper-event-lvm2*.so From bc6d22a59b4c368ad2d3941c86e5f2a6e7f5227c760b1bf6cce6e793ccd66471 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 10 Apr 2017 11:36:47 +0000 Subject: [PATCH 5/7] - Add 'lvm2-lockd' subpackage, fate#323203 to lvm2-clvm to not pull corosync and other deps to the core lvm2 package - Add 'lvm2-lockd' subpackage, fate#323203 to lvm2-clvm to not pull corosync and other deps to the core lvm2 package - Add 'lvm2-lockd' subpackage, fate#323203 to lvm2-clvm to not pull corosync and other deps to the core lvm2 package OBS-URL: https://build.opensuse.org/package/show/Base:System/lvm2?expand=0&rev=176 --- device-mapper.changes | 6 ++++ lvm2-clvm.changes | 6 ++++ lvm2-clvm.spec | 65 ++++++++++++++++++++++++++++++++++++++++++- lvm2.changes | 6 ++++ lvm2.spec | 2 +- 5 files changed, 83 insertions(+), 2 deletions(-) diff --git a/device-mapper.changes b/device-mapper.changes index c252484..c751511 100644 --- a/device-mapper.changes +++ b/device-mapper.changes @@ -6,6 +6,12 @@ Mon Apr 10 10:41:02 UTC 2017 - tchvatal@suse.com - Enable internal cache - Enable lvmpolld +------------------------------------------------------------------- +Mon Apr 10 07:41:10 UTC 2017 - zren@suse.com + +- Add 'lvm2-lockd' subpackage, fate#323203 to lvm2-clvm to not pull + corosync and other deps to the core lvm2 package + ------------------------------------------------------------------- Fri Feb 24 10:57:16 UTC 2017 - zren@suse.com diff --git a/lvm2-clvm.changes b/lvm2-clvm.changes index c252484..c751511 100644 --- a/lvm2-clvm.changes +++ b/lvm2-clvm.changes @@ -6,6 +6,12 @@ Mon Apr 10 10:41:02 UTC 2017 - tchvatal@suse.com - Enable internal cache - Enable lvmpolld +------------------------------------------------------------------- +Mon Apr 10 07:41:10 UTC 2017 - zren@suse.com + +- Add 'lvm2-lockd' subpackage, fate#323203 to lvm2-clvm to not pull + corosync and other deps to the core lvm2 package + ------------------------------------------------------------------- Fri Feb 24 10:57:16 UTC 2017 - zren@suse.com diff --git a/lvm2-clvm.spec b/lvm2-clvm.spec index 4df50ce..2e5c9f6 100644 --- a/lvm2-clvm.spec +++ b/lvm2-clvm.spec @@ -16,6 +16,8 @@ # +%define dlm_version 3.99.1 +%define sanlock_version 3.3.0 ### COMMON-DEF-BEGIN ### %define lvm2_version 2.02.168 %define device_mapper_version 1.02.137 @@ -33,9 +35,11 @@ Source1: ftp://sources.redhat.com/pub/lvm2/LVM2.%{lvm2_version}.tgz.asc Source2: clvmd.ocf Source3: cmirrord.ocf BuildRequires: libcorosync-devel -BuildRequires: libdlm-devel +BuildRequires: libdlm-devel >= %{dlm_version} BuildRequires: pkgconfig +BuildRequires: sanlock-devel >= %{sanlock_version} BuildRequires: thin-provisioning-tools >= %{thin_provisioning_version} +BuildRequires: pkgconfig(blkid) BuildRequires: pkgconfig(devmapper) BuildRequires: pkgconfig(libudev) Requires: corosync @@ -143,12 +147,20 @@ A daemon for using LVM2 Logival Volumes in a clustered environment. %build extra_opts=" + --enable-applib + --enable-blkid_wiping + --enable-cmdlib + --enable-lvmetad + --enable-lvmpolld + --enable-realtime --with-default-locking-dir=/run/lock/lvm --with-default-pid-dir=/run --with-default-run-dir=/run/lvm --with-clvmd=corosync --with-cluster=internal --enable-cmirrord + --enable-lockd-dlm + --enable-lockd-sanlock " ### COMMON-CONFIG-BEGIN ### @@ -183,8 +195,13 @@ make %{?_smp_mflags} make DESTDIR=%{buildroot} \ install_cluster \ install_systemd_units install_systemd_generators +make DESTDIR=%{buildroot} install -C daemons/lvmlockd make DESTDIR=%{buildroot} install -C daemons/cmirrord +# lvmlockd does not have separate target install the mans by hand for now +install -m0644 -D man/lvmlockd.8 %{buildroot}%{_mandir}/man8/lvmlockd.8 +install -m0644 -D man/lvmlockctl.8 %{buildroot}%{_mandir}/man8/lvmlockctl.8 + # ocf files install -m755 -D %{SOURCE2} "%{buildroot}/%{_libexecdir}/ocf/resource.d/lvm2/clvmd" install -m755 -D %{SOURCE3} "%{buildroot}/%{_libexecdir}/ocf/resource.d/lvm2/cmirrord" @@ -193,6 +210,8 @@ install -m755 -D %{SOURCE3} "%{buildroot}/%{_libexecdir}/ocf/resource.d/lvm2/cmi ln -s service %{buildroot}%{_sbindir}/rclvm2-cluster-activation ln -s service %{buildroot}%{_sbindir}/rclvm2-clvmd ln -s service %{buildroot}%{_sbindir}/rclvm2-cmirrord +ln -s service %{buildroot}%{_sbindir}/rclvm2-lvmlockd +ln -s service %{buildroot}%{_sbindir}/rclvm2-lvmlocking # remove files from lvm2 split due to systemd_generators picking them up rm %{buildroot}%{_unitdir}/blk-availability.service @@ -200,6 +219,12 @@ rm %{buildroot}%{_unitdir}/dm-event.service rm %{buildroot}%{_unitdir}/dm-event.socket rm %{buildroot}%{_unitdir}/lvm2-monitor.service rm %{buildroot}%{_mandir}/man8/lvm2-activation-generator.8 +rm %{buildroot}%{_libexecdir}/systemd/system-generators/lvm2-activation-generator +rm %{buildroot}%{_unitdir}/lvm2-lvmetad.service +rm %{buildroot}%{_unitdir}/lvm2-lvmetad.socket +rm %{buildroot}%{_unitdir}/lvm2-lvmpolld.service +rm %{buildroot}%{_unitdir}/lvm2-lvmpolld.socket +rm %{buildroot}%{_unitdir}/lvm2-pvscan@.service %files %defattr(-,root,root) @@ -238,4 +263,42 @@ A daemon for using LVM2 Logival Volumes in a clustered environment. %{_sbindir}/rclvm2-cmirrord %{_mandir}/man8/cmirrord.8%{ext_man} +############################################################################## +# LVM locking daemon +############################################################################## + +%package -n lvm2-lockd +Summary: LVM locking daemon +Group: Productivity/Clustering/HA +Requires: libdlm >= %{dlm_version} +Requires: libsanlock1 >= %{sanlock_version} +Requires: lvm2 = %{version} +%{?systemd_requires} + +%description -n lvm2-lockd +LVM commands use lvmlockd to coordinate access to shared storage. + +%pre -n lvm2-lockd +%service_add_pre lvm2-lvmlockd.service lvm2-lvmlocking.service + +%post -n lvm2-lockd +%service_add_post lvm2-lvmlockd.service lvm2-lvmlocking.service + +%preun -n lvm2-lockd +%service_del_preun lvm2-lvmlockd.service lvm2-lvmlocking.service + +%postun -n lvm2-lockd +%service_del_postun lvm2-lvmlockd.service lvm2-lvmlocking.service + +%files -n lvm2-lockd +%defattr(-,root,root,) +%{_sbindir}/lvmlockd +%{_sbindir}/lvmlockctl +%{_mandir}/man8/lvmlockd.8%{ext_man} +%{_mandir}/man8/lvmlockctl.8%{ext_man} +%{_unitdir}/lvm2-lvmlockd.service +%{_unitdir}/lvm2-lvmlocking.service +%{_sbindir}/rclvm2-lvmlockd +%{_sbindir}/rclvm2-lvmlocking + %changelog diff --git a/lvm2.changes b/lvm2.changes index c252484..c751511 100644 --- a/lvm2.changes +++ b/lvm2.changes @@ -6,6 +6,12 @@ Mon Apr 10 10:41:02 UTC 2017 - tchvatal@suse.com - Enable internal cache - Enable lvmpolld +------------------------------------------------------------------- +Mon Apr 10 07:41:10 UTC 2017 - zren@suse.com + +- Add 'lvm2-lockd' subpackage, fate#323203 to lvm2-clvm to not pull + corosync and other deps to the core lvm2 package + ------------------------------------------------------------------- Fri Feb 24 10:57:16 UTC 2017 - zren@suse.com diff --git a/lvm2.spec b/lvm2.spec index 5cb5c6d..4b52fab 100644 --- a/lvm2.spec +++ b/lvm2.spec @@ -463,7 +463,7 @@ popd %{_unitdir}/lvm2-pvscan@.service %{_unitdir}/lvm2-lvmpolld.socket %{_unitdir}/lvm2-lvmpolld.service -%{_prefix}/lib/systemd/system-generators/lvm2-activation-generator +%{_libexecdir}/systemd/system-generators/lvm2-activation-generator %dir %{_libdir}/device-mapper %{_libdir}/device-mapper/libdevmapper-event-lvm2*.so %{_libdir}/libdevmapper-event-lvm2*.so From 1c7cea6733027566610d511002e478f95da2e78553cd3fbd05881d04bedf6a96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 18 Apr 2017 10:55:18 +0000 Subject: [PATCH 6/7] Accepting request 487889 from home:jnelson-suse:branches:Base:System - Update device mapper version to 1.02.138, see WHATS_NEW_DM for detailed changelogs * Drop obsolete lvmchange files accordingly - Refresh libdm-iface-not-output-error-message-inside-retry-loop.patch - Refresh make-mirror-legs-on-different-tag-pvs.patch - device-mapper-dmsetup-export.patch - LVM version update to 2.02.169 release, see WHATS_NEW and WHATS_NEW_DM files for detailed changelogs old: Base:System/lvm2 new: home:jnelson-suse:branches:Base:System/lvm2 rev None Index: device-mapper-dmsetup-export.patch =================================================================== --- device-mapper-dmsetup-export.patch (revision 176) +++ device-mapper-dmsetup-export.patch (revision 5) @@ -1,7 +1,20 @@ -Index: LVM2.2.02.139/man/dmsetup.8.in +From b148cb1c1e801455cb774f51eecd57f7e4f98c39 Mon Sep 17 00:00:00 2001 +From: Eric Ren +Date: Tue, 11 Apr 2017 10:58:56 +0800 +Subject: [PATCH] DM: add dmsetup export + +bsc#479104 + +Patch-refreshed-by: Eric Ren +--- + man/dmsetup.8_main | 16 +++- + tools/dmsetup.c | 252 ++++++++++++++++++++++++++++++++++++++++++++++++++++- + 2 files changed, 266 insertions(+), 2 deletions(-) + +Index: LVM2.2.02.169/man/dmsetup.8_main =================================================================== ---- LVM2.2.02.139.orig/man/dmsetup.8.in -+++ LVM2.2.02.139/man/dmsetup.8.in +--- LVM2.2.02.169.orig/man/dmsetup.8_main ++++ LVM2.2.02.169/man/dmsetup.8_main @@ -97,7 +97,15 @@ dmsetup \(em low level logical volume ma .. .CMD_LOAD @@ -23,20 +36,20 @@ See below for more information on the table format. . .HP -+.BR \-\-export ++.BR --export +.IR export +.br +Outputs information in key/value format to be imported by other programs. +. +.HP - .BR \-\-udevcookie + .BR --udevcookie .IR cookie .br -Index: LVM2.2.02.139/tools/dmsetup.c +Index: LVM2.2.02.169/tools/dmsetup.c =================================================================== ---- LVM2.2.02.139.orig/tools/dmsetup.c -+++ LVM2.2.02.139/tools/dmsetup.c -@@ -2177,6 +2177,129 @@ out: +--- LVM2.2.02.169.orig/tools/dmsetup.c ++++ LVM2.2.02.169/tools/dmsetup.c +@@ -2231,6 +2231,129 @@ out: return r; } @@ -166,11 +179,16 @@ /* Show target names and their version numbers */ static int _targets(CMD_ARGS) { -@@ -5138,6 +5261,7 @@ static struct command _dmsetup_commands[ - {"deps", "[-o ] []", 0, -1, 1, 0, _deps}, - {"stats", " [] []", 1, -1, 1, 1, _stats}, - {"status", "[] [--noflush] [--target ]", 0, -1, 1, 0, _status}, +@@ -5904,7 +6027,11 @@ static struct command _dmsetup_commands[ + {"deps", "[-o ] [...]", 0, -1, 1, 0, _deps}, + {"stats", " [] [...]", 1, -1, 1, 1, _stats}, + {"status", "[...] [--noflush] [--target ]", 0, -1, 1, 0, _status}, +- {"table", "[...] [--target ] [--showkeys]", 0, -1, 1, 0, _status}, ++ {"deps", "[-o ] []", 0, -1, 1, 0, _deps}, ++ {"stats", " [] []", 1, -1, 1, 1, _stats}, ++ {"status", "[] [--noflush] [--target ]", 0, -1, 1, 0, _status}, + {"export", "[]", 0, -1, 1, 0, _export}, - {"table", "[] [--target ] [--showkeys]", 0, -1, 1, 0, _status}, ++ {"table", "[] [--target ] [--showkeys]", 0, -1, 1, 0, _status}, {"wait", " [] [--noflush]", 0, 2, 0, 0, _wait}, - {"mknodes", "[]", 0, -1, 1, 0, _mknodes}, + {"mknodes", "[...]", 0, -1, 1, 0, _mknodes}, + {"mangle", "[...]", 0, -1, 1, 0, _mangle}, Index: device-mapper.changes =================================================================== --- device-mapper.changes (revision 176) +++ device-mapper.changes (revision 5) @@ -1,4 +1,20 @@ ------------------------------------------------------------------- +Wed Apr 12 01:33:15 UTC 2017 - zren@suse.com + +- Update device mapper version to 1.02.138, see WHATS_NEW_DM for + detailed changelogs + * Drop obsolete lvmchange files accordingly +- Refresh libdm-iface-not-output-error-message-inside-retry-loop.patch +- Refresh make-mirror-legs-on-different-tag-pvs.patch +- device-mapper-dmsetup-export.patch + +------------------------------------------------------------------- +Mon Apr 10 23:08:45 UTC 2017 - jnelson-suse@jamponi.net + +- Version update to 2.02.169 release, see WHATS_NEW and WHATS_NEW_DM + files for detailed changelogs + +------------------------------------------------------------------- Mon Apr 10 10:41:02 UTC 2017 - tchvatal@suse.com - Split configure options to have one per line Index: device-mapper.spec =================================================================== --- device-mapper.spec (revision 176) +++ device-mapper.spec (revision 5) @@ -19,8 +19,8 @@ %define libname libdevmapper1_03 %define libname_event libdevmapper-event1_03 ### COMMON-DEF-BEGIN ### -%define lvm2_version 2.02.168 -%define device_mapper_version 1.02.137 +%define lvm2_version 2.02.169 +%define device_mapper_version 1.02.138 %define thin_provisioning_version 0.5.6 ### COMMON-DEF-END ### Name: device-mapper Index: libdm-iface-not-output-error-message-inside-retry-loop.patch =================================================================== --- libdm-iface-not-output-error-message-inside-retry-loop.patch (revision 176) +++ libdm-iface-not-output-error-message-inside-retry-loop.patch (revision 5) @@ -1,22 +1,25 @@ -From a70f17fd1dc9a8cccefb946c3501d5cb6f2766bb Mon Sep 17 00:00:00 2001 -From: Liuhua Wang -Date: Mon, 23 Nov 2015 13:49:39 +0800 +From 3c4d9dd3571e89545d97c8421fd4cbdbaa6895b8 Mon Sep 17 00:00:00 2001 +From: Eric Ren +Date: Tue, 11 Apr 2017 11:09:26 +0800 Subject: [PATCH] libdm-iface: not output error message inside retry loops -This is a workaround to avoid noisy error message being output inside retry loops -in case of remove failure because device busy. But as to the replies from upstream +This is a workaround to avoid noisy error message being output inside +retry loops +in case of remove failure because device busy. But as to the replies +from upstream there may be some issues in udev operations. References: bsc#940298 boo#957059 Signed-off-by: lwang@suse.com +Patch-refreshed-by: Eric Ren --- - libdm/ioctl/libdm-iface.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + libdm/ioctl/libdm-iface.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) -Index: LVM2.2.02.141/libdm/ioctl/libdm-iface.c -=================================================================== ---- LVM2.2.02.141.orig/libdm/ioctl/libdm-iface.c -+++ LVM2.2.02.141/libdm/ioctl/libdm-iface.c +diff --git a/libdm/ioctl/libdm-iface.c b/libdm/ioctl/libdm-iface.c +index cb3e8dc..c1c0771 100644 +--- a/libdm/ioctl/libdm-iface.c ++++ b/libdm/ioctl/libdm-iface.c @@ -62,6 +62,7 @@ */ #define MAPPER_CTRL_MINOR 236 @@ -25,15 +28,17 @@ /* dm major version no for running kernel */ static unsigned _dm_version = DM_VERSION_MAJOR; -@@ -1862,7 +1863,7 @@ static struct dm_ioctl *_do_dm_ioctl(str +@@ -1862,8 +1863,8 @@ static struct dm_ioctl *_do_dm_ioctl(struct dm_task *dmt, unsigned command, dmt->major > 0 && dmt->minor == 0 ? "0" : "", dmt->major > 0 ? ")" : "", strerror(dmt->ioctl_errno)); - else +- log_error("device-mapper: %s ioctl on %s %s%s%.0d%s%.0d%s%s " + else if(errno != EBUSY || retry_repeat_count == DM_IOCTL_RETRIES) - log_error("device-mapper: %s ioctl on %s%s%s%.0d%s%.0d%s%s " ++ log_error("device-mapper: %s ioctl on %s%s%s%.0d%s%.0d%s%s " "failed: %s", _cmd_data_v4[dmt->type].name, + dmi->name, dmi->uuid, @@ -1915,7 +1916,6 @@ void dm_task_update_nodes(void) update_devs(); } @@ -42,3 +47,6 @@ #define DM_RETRY_USLEEP_DELAY 200000 int dm_task_get_errno(struct dm_task *dmt) +-- +2.10.2 + Index: lvm2-clvm.changes =================================================================== --- lvm2-clvm.changes (revision 176) +++ lvm2-clvm.changes (revision 5) @@ -1,4 +1,20 @@ ------------------------------------------------------------------- +Wed Apr 12 01:33:15 UTC 2017 - zren@suse.com + +- Update device mapper version to 1.02.138, see WHATS_NEW_DM for + detailed changelogs + * Drop obsolete lvmchange files accordingly +- Refresh libdm-iface-not-output-error-message-inside-retry-loop.patch +- Refresh make-mirror-legs-on-different-tag-pvs.patch +- device-mapper-dmsetup-export.patch + +------------------------------------------------------------------- +Mon Apr 10 23:08:45 UTC 2017 - jnelson-suse@jamponi.net + +- Version update to 2.02.169 release, see WHATS_NEW and WHATS_NEW_DM + files for detailed changelogs + +------------------------------------------------------------------- Mon Apr 10 10:41:02 UTC 2017 - tchvatal@suse.com - Split configure options to have one per line Index: lvm2-clvm.spec =================================================================== --- lvm2-clvm.spec (revision 176) +++ lvm2-clvm.spec (revision 5) @@ -19,8 +19,8 @@ %define dlm_version 3.99.1 %define sanlock_version 3.3.0 ### COMMON-DEF-BEGIN ### -%define lvm2_version 2.02.168 -%define device_mapper_version 1.02.137 +%define lvm2_version 2.02.169 +%define device_mapper_version 1.02.138 %define thin_provisioning_version 0.5.6 ### COMMON-DEF-END ### Name: lvm2-clvm Index: lvm2.changes =================================================================== --- lvm2.changes (revision 176) +++ lvm2.changes (revision 5) @@ -1,4 +1,20 @@ ------------------------------------------------------------------- +Wed Apr 12 01:33:15 UTC 2017 - zren@suse.com + +- Update device mapper version to 1.02.138, see WHATS_NEW_DM for + detailed changelogs + * Drop obsolete lvmchange files accordingly +- Refresh libdm-iface-not-output-error-message-inside-retry-loop.patch +- Refresh make-mirror-legs-on-different-tag-pvs.patch +- device-mapper-dmsetup-export.patch + +------------------------------------------------------------------- +Mon Apr 10 23:08:45 UTC 2017 - jnelson-suse@jamponi.net + +- Version update to 2.02.169 release, see WHATS_NEW and WHATS_NEW_DM + files for detailed changelogs + +------------------------------------------------------------------- Mon Apr 10 10:41:02 UTC 2017 - tchvatal@suse.com - Split configure options to have one per line Index: lvm2.spec =================================================================== --- lvm2.spec (revision 176) +++ lvm2.spec (revision 5) @@ -20,8 +20,8 @@ %define applib liblvm2app2_2 %define cmdlib liblvm2cmd2_02 ### COMMON-DEF-BEGIN ### -%define lvm2_version 2.02.168 -%define device_mapper_version 1.02.137 +%define lvm2_version 2.02.169 +%define device_mapper_version 1.02.138 %define thin_provisioning_version 0.5.6 ### COMMON-DEF-END ### Name: lvm2 @@ -282,7 +282,6 @@ %{_sbindir}/lvcreate %{_sbindir}/lvdisplay %{_sbindir}/lvextend -%{_sbindir}/lvmchange %{_sbindir}/lvmdiskscan %{_sbindir}/lvmsadc %{_sbindir}/lvmsar @@ -336,7 +335,6 @@ /sbin/lvcreate /sbin/lvdisplay /sbin/lvextend -/sbin/lvmchange /sbin/lvmdiskscan /sbin/lvmsadc /sbin/lvmsar @@ -391,7 +389,6 @@ %{_mandir}/man8/lvm-config.8%{ext_man} %{_mandir}/man8/lvmconfig.8%{ext_man} %{_mandir}/man8/lvm-dumpconfig.8%{ext_man} -%{_mandir}/man8/lvmchange.8%{ext_man} %{_mandir}/man8/lvmconf.8%{ext_man} %{_mandir}/man8/lvmdiskscan.8%{ext_man} %{_mandir}/man8/lvmdump.8%{ext_man} Index: make-mirror-legs-on-different-tag-pvs.patch =================================================================== --- make-mirror-legs-on-different-tag-pvs.patch (revision 176) +++ make-mirror-legs-on-different-tag-pvs.patch (revision 5) @@ -1,10 +1,10 @@ -From 49a5da732c74b8b96bc123a541d590c4fd06d7af Mon Sep 17 00:00:00 2001 -From: Guangliang Zhao -Date: Mon, 12 Nov 2012 15:28:11 +0800 -Subject: [PATCH 1/2] mirror: make mirror legs on different tag pvs +From b17f2ae4334f9233a88d7a2fcae325f86691beb0 Mon Sep 17 00:00:00 2001 +From: Eric Ren +Date: Tue, 11 Apr 2017 10:44:30 +0800 +Subject: [PATCH] [PATCH 1/2] mirror: make mirror legs on different tag pvs -The mirror legs could be placed on the PVs(with different -tags) from the other mirror legs with this patch. +The mirror legs could be placed on the PVs(with different tags) +from the other mirror legs with this patch. The lvcreate allocates the replica "randomly" when creating a mirrored logical volume now, so it could happen that both @@ -17,18 +17,19 @@ always be placed on pvs with differnt tags. Signed-off-by: Guangliang Zhao +Fix-conflict-by: Eric Ren --- - conf/example.conf.in | 17 +++++++++++++++++ - lib/config/config_settings.h | 3 +++ - lib/config/defaults.h | 1 + - lib/metadata/lv_manip.c | 35 +++++++++++++++++++++++++++++++++++ - man/lvcreate.8.in | 4 ++++ - 5 files changed, 60 insertions(+) + conf/example.conf.in | 17 +++++++++++++++++ + lib/config/config_settings.h | 5 ++++- + lib/config/defaults.h | 1 + + lib/metadata/lv_manip.c | 35 +++++++++++++++++++++++++++++++++++ + man/lvcreate.8_pregen | 7 +++++++ + 5 files changed, 64 insertions(+), 1 deletion(-) -Index: LVM2.2.02.165/conf/example.conf.in -=================================================================== ---- LVM2.2.02.165.orig/conf/example.conf.in -+++ LVM2.2.02.165/conf/example.conf.in +diff --git a/conf/example.conf.in b/conf/example.conf.in +index 614ce53..b33289f 100644 +--- a/conf/example.conf.in ++++ b/conf/example.conf.in @@ -372,6 +372,23 @@ allocation { # or erased unless the --wipesignatures option is used directly. wipe_signatures_when_zeroing_new_lvs = 1 @@ -53,25 +54,27 @@ # Configuration option allocation/mirror_logs_require_separate_pvs. # Mirror logs and images will always use different PVs. # The default setting changed in version 2.02.85. -Index: LVM2.2.02.165/lib/config/config_settings.h -=================================================================== ---- LVM2.2.02.165.orig/lib/config/config_settings.h -+++ LVM2.2.02.165/lib/config/config_settings.h -@@ -473,6 +473,9 @@ cfg(allocation_raid_stripe_all_devices_C +diff --git a/lib/config/config_settings.h b/lib/config/config_settings.h +index b701722..0e5a5e2 100644 +--- a/lib/config/config_settings.h ++++ b/lib/config/config_settings.h +@@ -473,7 +473,10 @@ cfg(allocation_raid_stripe_all_devices_CFG, "raid_stripe_all_devices", allocatio "when the command does not specify the number of stripes to use.\n" "This was the default behaviour until release 2.02.162.\n") +-cfg(allocation_cache_pool_metadata_require_separate_pvs_CFG, "cache_pool_metadata_require_separate_pvs", allocation_CFG_SECTION, CFG_PROFILABLE | CFG_PROFILABLE_METADATA, CFG_TYPE_BOOL, DEFAULT_CACHE_POOL_METADATA_REQUIRE_SEPARATE_PVS, vsn(2, 2, 106), NULL, 0, NULL, +cfg(allocation_mirror_legs_require_separate_pvs_CFG, "mirror_legs_require_separate_pvs", allocation_CFG_SECTION, 0, CFG_TYPE_BOOL, DEFAULT_MIRROR_LEGS_REQUIRE_SEPARATE_PVS, vsn(2, 2, 98), NULL, 0, NULL, + "Mirror legs will always use different PVs.\n") + - cfg(allocation_cache_pool_metadata_require_separate_pvs_CFG, "cache_pool_metadata_require_separate_pvs", allocation_CFG_SECTION, 0, CFG_TYPE_BOOL, DEFAULT_CACHE_POOL_METADATA_REQUIRE_SEPARATE_PVS, vsn(2, 2, 106), NULL, 0, NULL, ++cfg(allocation_cache_pool_metadata_require_separate_pvs_CFG, "cache_pool_metadata_require_separate_pvs", allocation_CFG_SECTION, 0, CFG_TYPE_BOOL, DEFAULT_CACHE_POOL_METADATA_REQUIRE_SEPARATE_PVS, vsn(2, 2, 106), NULL, 0, NULL, "Cache pool metadata and data will always use different PVs.\n") -Index: LVM2.2.02.165/lib/config/defaults.h -=================================================================== ---- LVM2.2.02.165.orig/lib/config/defaults.h -+++ LVM2.2.02.165/lib/config/defaults.h -@@ -158,6 +158,7 @@ + cfg(allocation_cache_pool_cachemode_CFG, "cache_pool_cachemode", allocation_CFG_SECTION, CFG_PROFILABLE | CFG_PROFILABLE_METADATA | CFG_DEFAULT_COMMENTED, CFG_TYPE_STRING, DEFAULT_CACHE_MODE, vsn(2, 2, 113), NULL, vsn(2, 2, 128), +diff --git a/lib/config/defaults.h b/lib/config/defaults.h +index 2340636..256fab6 100644 +--- a/lib/config/defaults.h ++++ b/lib/config/defaults.h +@@ -159,6 +159,7 @@ #define DEFAULT_MAX_LV 0 #define DEFAULT_ALLOC_POLICY ALLOC_NORMAL #define DEFAULT_MIRROR_LOGS_REQUIRE_SEPARATE_PVS 0 @@ -79,11 +82,11 @@ #define DEFAULT_MAXIMISE_CLING 1 #define DEFAULT_CLUSTERED 0 -Index: LVM2.2.02.165/lib/metadata/lv_manip.c -=================================================================== ---- LVM2.2.02.165.orig/lib/metadata/lv_manip.c -+++ LVM2.2.02.165/lib/metadata/lv_manip.c -@@ -1519,6 +1519,9 @@ struct alloc_handle { +diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c +index 0dfbad4..357e46a 100644 +--- a/lib/metadata/lv_manip.c ++++ b/lib/metadata/lv_manip.c +@@ -1622,6 +1622,9 @@ struct alloc_handle { unsigned maximise_cling; unsigned mirror_logs_separate; /* Force mirror logs on separate PVs? */ @@ -93,7 +96,7 @@ /* * RAID devices require a metadata area that accompanies each -@@ -2633,6 +2636,32 @@ static int _limit_to_one_area_per_tag(st +@@ -2736,6 +2739,32 @@ static int _limit_to_one_area_per_tag(struct alloc_handle *ah, struct alloc_stat } /* @@ -126,7 +129,7 @@ * Returns 1 regardless of whether any space was found, except on error. */ static int _find_some_parallel_space(struct alloc_handle *ah, -@@ -2762,6 +2791,10 @@ static int _find_some_parallel_space(str +@@ -2865,6 +2894,10 @@ static int _find_some_parallel_space(struct alloc_handle *ah, continue; case USE_AREA: @@ -137,7 +140,7 @@ /* * Except with ALLOC_ANYWHERE, replace first area with this * one which is smaller but still big enough. -@@ -3243,6 +3276,7 @@ static struct alloc_handle *_alloc_init( +@@ -3355,6 +3388,7 @@ static struct alloc_handle *_alloc_init(struct cmd_context *cmd, ah->parity_count = parity_count; ah->region_size = region_size; ah->alloc = alloc; @@ -145,7 +148,7 @@ /* * For the purposes of allocation, area_count and parity_count are -@@ -3254,6 +3288,7 @@ static struct alloc_handle *_alloc_init( +@@ -3366,6 +3400,7 @@ static struct alloc_handle *_alloc_init(struct cmd_context *cmd, ah->area_multiple = _calc_area_multiple(segtype, area_count + parity_count, stripes); //FIXME: s/mirror_logs_separate/metadata_separate/ so it can be used by others? ah->mirror_logs_separate = find_config_tree_bool(cmd, allocation_mirror_logs_require_separate_pvs_CFG, NULL); @@ -153,18 +156,24 @@ if (mirrors || stripes) total_extents = new_extents; -Index: LVM2.2.02.165/man/lvcreate.8.in -=================================================================== ---- LVM2.2.02.165.orig/man/lvcreate.8.in -+++ LVM2.2.02.165/man/lvcreate.8.in -@@ -418,6 +418,10 @@ Using \fBcore\fP means the mirror is reg - from the first device each time the logical volume is activated, - like after every reboot. +diff --git a/man/lvcreate.8_pregen b/man/lvcreate.8_pregen +index 6663087..c385927 100644 +--- a/man/lvcreate.8_pregen ++++ b/man/lvcreate.8_pregen +@@ -416,6 +416,13 @@ Create a raid10 LV. + [ \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT] ] + .ad b .br +Every leg of the mirrored logical volume could be placed on the pvs with +same tag, see details(mirror_legs_require_separate_pvs) in lvm.conf. + +.br - Using \fBmirrored\fP will create a persistent log that is itself mirrored. - . - .HP ++Using \fBmirrored\fP will create a persistent log that is itself mirrored. ++. ++.HP + .ad l + [ \fB-R\fP|\fB--regionsize\fP \fISize\fP[m|UNIT] ] + .ad b +-- +2.10.2 + Index: LVM2.2.02.169.tgz =================================================================== Binary file LVM2.2.02.169.tgz (revision 5) added Index: LVM2.2.02.169.tgz.asc =================================================================== --- LVM2.2.02.169.tgz.asc (added) +++ LVM2.2.02.169.tgz.asc (revision 5) @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.14 (GNU/Linux) + +iEYEABECAAYFAljafgEACgkQIoGRwVZ+LBeo5wCfVaQeSN73FPcJf86c3aqrFmZu +Rs0AoJ6l75QbY2V55rhunJvwwDllKlpF +=0Jtt +-----END PGP SIGNATURE----- Index: LVM2.2.02.168.tgz =================================================================== Binary file LVM2.2.02.168.tgz (revision 176) deleted Index: LVM2.2.02.168.tgz.asc =================================================================== --- LVM2.2.02.168.tgz.asc (revision 176) +++ LVM2.2.02.168.tgz.asc (deleted) @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) - -iEUEABECAAYFAlg/XqMACgkQIoGRwVZ+LBdjQACVGeU4I+B5ETIhINJeYXy2bLNu -hQCgxEmGwG0ec2frSXhQociTYfT6vVc= -=T5md ------END PGP SIGNATURE----- OBS-URL: https://build.opensuse.org/request/show/487889 OBS-URL: https://build.opensuse.org/package/show/Base:System/lvm2?expand=0&rev=177 --- LVM2.2.02.168.tgz | 3 - LVM2.2.02.168.tgz.asc | 7 -- LVM2.2.02.169.tgz | 3 + LVM2.2.02.169.tgz.asc | 7 ++ device-mapper-dmsetup-export.patch | 48 ++++++--- device-mapper.changes | 16 +++ device-mapper.spec | 4 +- ...tput-error-message-inside-retry-loop.patch | 34 +++--- lvm2-clvm.changes | 16 +++ lvm2-clvm.spec | 4 +- lvm2.changes | 16 +++ lvm2.spec | 7 +- make-mirror-legs-on-different-tag-pvs.patch | 101 ++++++++++-------- 13 files changed, 173 insertions(+), 93 deletions(-) delete mode 100644 LVM2.2.02.168.tgz delete mode 100644 LVM2.2.02.168.tgz.asc create mode 100644 LVM2.2.02.169.tgz create mode 100644 LVM2.2.02.169.tgz.asc diff --git a/LVM2.2.02.168.tgz b/LVM2.2.02.168.tgz deleted file mode 100644 index 6e0b23d..0000000 --- a/LVM2.2.02.168.tgz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:23a3d1cddd41b3ef51812ebf83e9fa491f502fe74130d4263be327a91914660d -size 2159438 diff --git a/LVM2.2.02.168.tgz.asc b/LVM2.2.02.168.tgz.asc deleted file mode 100644 index 11d555f..0000000 --- a/LVM2.2.02.168.tgz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) - -iEUEABECAAYFAlg/XqMACgkQIoGRwVZ+LBdjQACVGeU4I+B5ETIhINJeYXy2bLNu -hQCgxEmGwG0ec2frSXhQociTYfT6vVc= -=T5md ------END PGP SIGNATURE----- diff --git a/LVM2.2.02.169.tgz b/LVM2.2.02.169.tgz new file mode 100644 index 0000000..0231063 --- /dev/null +++ b/LVM2.2.02.169.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:757d2eb736e5f6ba1c78428400cd0dfdaf68344fd93d0c009cb6c11b4b97eb4a +size 2328589 diff --git a/LVM2.2.02.169.tgz.asc b/LVM2.2.02.169.tgz.asc new file mode 100644 index 0000000..55e8faa --- /dev/null +++ b/LVM2.2.02.169.tgz.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.14 (GNU/Linux) + +iEYEABECAAYFAljafgEACgkQIoGRwVZ+LBeo5wCfVaQeSN73FPcJf86c3aqrFmZu +Rs0AoJ6l75QbY2V55rhunJvwwDllKlpF +=0Jtt +-----END PGP SIGNATURE----- diff --git a/device-mapper-dmsetup-export.patch b/device-mapper-dmsetup-export.patch index 50b2639..d57e52b 100644 --- a/device-mapper-dmsetup-export.patch +++ b/device-mapper-dmsetup-export.patch @@ -1,7 +1,20 @@ -Index: LVM2.2.02.139/man/dmsetup.8.in +From b148cb1c1e801455cb774f51eecd57f7e4f98c39 Mon Sep 17 00:00:00 2001 +From: Eric Ren +Date: Tue, 11 Apr 2017 10:58:56 +0800 +Subject: [PATCH] DM: add dmsetup export + +bsc#479104 + +Patch-refreshed-by: Eric Ren +--- + man/dmsetup.8_main | 16 +++- + tools/dmsetup.c | 252 ++++++++++++++++++++++++++++++++++++++++++++++++++++- + 2 files changed, 266 insertions(+), 2 deletions(-) + +Index: LVM2.2.02.169/man/dmsetup.8_main =================================================================== ---- LVM2.2.02.139.orig/man/dmsetup.8.in -+++ LVM2.2.02.139/man/dmsetup.8.in +--- LVM2.2.02.169.orig/man/dmsetup.8_main ++++ LVM2.2.02.169/man/dmsetup.8_main @@ -97,7 +97,15 @@ dmsetup \(em low level logical volume ma .. .CMD_LOAD @@ -23,20 +36,20 @@ Index: LVM2.2.02.139/man/dmsetup.8.in See below for more information on the table format. . .HP -+.BR \-\-export ++.BR --export +.IR export +.br +Outputs information in key/value format to be imported by other programs. +. +.HP - .BR \-\-udevcookie + .BR --udevcookie .IR cookie .br -Index: LVM2.2.02.139/tools/dmsetup.c +Index: LVM2.2.02.169/tools/dmsetup.c =================================================================== ---- LVM2.2.02.139.orig/tools/dmsetup.c -+++ LVM2.2.02.139/tools/dmsetup.c -@@ -2177,6 +2177,129 @@ out: +--- LVM2.2.02.169.orig/tools/dmsetup.c ++++ LVM2.2.02.169/tools/dmsetup.c +@@ -2231,6 +2231,129 @@ out: return r; } @@ -166,11 +179,16 @@ Index: LVM2.2.02.139/tools/dmsetup.c /* Show target names and their version numbers */ static int _targets(CMD_ARGS) { -@@ -5138,6 +5261,7 @@ static struct command _dmsetup_commands[ - {"deps", "[-o ] []", 0, -1, 1, 0, _deps}, - {"stats", " [] []", 1, -1, 1, 1, _stats}, - {"status", "[] [--noflush] [--target ]", 0, -1, 1, 0, _status}, +@@ -5904,7 +6027,11 @@ static struct command _dmsetup_commands[ + {"deps", "[-o ] [...]", 0, -1, 1, 0, _deps}, + {"stats", " [] [...]", 1, -1, 1, 1, _stats}, + {"status", "[...] [--noflush] [--target ]", 0, -1, 1, 0, _status}, +- {"table", "[...] [--target ] [--showkeys]", 0, -1, 1, 0, _status}, ++ {"deps", "[-o ] []", 0, -1, 1, 0, _deps}, ++ {"stats", " [] []", 1, -1, 1, 1, _stats}, ++ {"status", "[] [--noflush] [--target ]", 0, -1, 1, 0, _status}, + {"export", "[]", 0, -1, 1, 0, _export}, - {"table", "[] [--target ] [--showkeys]", 0, -1, 1, 0, _status}, ++ {"table", "[] [--target ] [--showkeys]", 0, -1, 1, 0, _status}, {"wait", " [] [--noflush]", 0, 2, 0, 0, _wait}, - {"mknodes", "[]", 0, -1, 1, 0, _mknodes}, + {"mknodes", "[...]", 0, -1, 1, 0, _mknodes}, + {"mangle", "[...]", 0, -1, 1, 0, _mangle}, diff --git a/device-mapper.changes b/device-mapper.changes index c751511..ce56a10 100644 --- a/device-mapper.changes +++ b/device-mapper.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Wed Apr 12 01:33:15 UTC 2017 - zren@suse.com + +- Update device mapper version to 1.02.138, see WHATS_NEW_DM for + detailed changelogs + * Drop obsolete lvmchange files accordingly +- Refresh libdm-iface-not-output-error-message-inside-retry-loop.patch +- Refresh make-mirror-legs-on-different-tag-pvs.patch +- device-mapper-dmsetup-export.patch + +------------------------------------------------------------------- +Mon Apr 10 23:08:45 UTC 2017 - jnelson-suse@jamponi.net + +- Version update to 2.02.169 release, see WHATS_NEW and WHATS_NEW_DM + files for detailed changelogs + ------------------------------------------------------------------- Mon Apr 10 10:41:02 UTC 2017 - tchvatal@suse.com diff --git a/device-mapper.spec b/device-mapper.spec index 3a6c41b..13978c0 100644 --- a/device-mapper.spec +++ b/device-mapper.spec @@ -19,8 +19,8 @@ %define libname libdevmapper1_03 %define libname_event libdevmapper-event1_03 ### COMMON-DEF-BEGIN ### -%define lvm2_version 2.02.168 -%define device_mapper_version 1.02.137 +%define lvm2_version 2.02.169 +%define device_mapper_version 1.02.138 %define thin_provisioning_version 0.5.6 ### COMMON-DEF-END ### Name: device-mapper diff --git a/libdm-iface-not-output-error-message-inside-retry-loop.patch b/libdm-iface-not-output-error-message-inside-retry-loop.patch index 4d99df2..dcddbcd 100644 --- a/libdm-iface-not-output-error-message-inside-retry-loop.patch +++ b/libdm-iface-not-output-error-message-inside-retry-loop.patch @@ -1,22 +1,25 @@ -From a70f17fd1dc9a8cccefb946c3501d5cb6f2766bb Mon Sep 17 00:00:00 2001 -From: Liuhua Wang -Date: Mon, 23 Nov 2015 13:49:39 +0800 +From 3c4d9dd3571e89545d97c8421fd4cbdbaa6895b8 Mon Sep 17 00:00:00 2001 +From: Eric Ren +Date: Tue, 11 Apr 2017 11:09:26 +0800 Subject: [PATCH] libdm-iface: not output error message inside retry loops -This is a workaround to avoid noisy error message being output inside retry loops -in case of remove failure because device busy. But as to the replies from upstream +This is a workaround to avoid noisy error message being output inside +retry loops +in case of remove failure because device busy. But as to the replies +from upstream there may be some issues in udev operations. References: bsc#940298 boo#957059 Signed-off-by: lwang@suse.com +Patch-refreshed-by: Eric Ren --- - libdm/ioctl/libdm-iface.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + libdm/ioctl/libdm-iface.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) -Index: LVM2.2.02.141/libdm/ioctl/libdm-iface.c -=================================================================== ---- LVM2.2.02.141.orig/libdm/ioctl/libdm-iface.c -+++ LVM2.2.02.141/libdm/ioctl/libdm-iface.c +diff --git a/libdm/ioctl/libdm-iface.c b/libdm/ioctl/libdm-iface.c +index cb3e8dc..c1c0771 100644 +--- a/libdm/ioctl/libdm-iface.c ++++ b/libdm/ioctl/libdm-iface.c @@ -62,6 +62,7 @@ */ #define MAPPER_CTRL_MINOR 236 @@ -25,15 +28,17 @@ Index: LVM2.2.02.141/libdm/ioctl/libdm-iface.c /* dm major version no for running kernel */ static unsigned _dm_version = DM_VERSION_MAJOR; -@@ -1862,7 +1863,7 @@ static struct dm_ioctl *_do_dm_ioctl(str +@@ -1862,8 +1863,8 @@ static struct dm_ioctl *_do_dm_ioctl(struct dm_task *dmt, unsigned command, dmt->major > 0 && dmt->minor == 0 ? "0" : "", dmt->major > 0 ? ")" : "", strerror(dmt->ioctl_errno)); - else +- log_error("device-mapper: %s ioctl on %s %s%s%.0d%s%.0d%s%s " + else if(errno != EBUSY || retry_repeat_count == DM_IOCTL_RETRIES) - log_error("device-mapper: %s ioctl on %s%s%s%.0d%s%.0d%s%s " ++ log_error("device-mapper: %s ioctl on %s%s%s%.0d%s%.0d%s%s " "failed: %s", _cmd_data_v4[dmt->type].name, + dmi->name, dmi->uuid, @@ -1915,7 +1916,6 @@ void dm_task_update_nodes(void) update_devs(); } @@ -42,3 +47,6 @@ Index: LVM2.2.02.141/libdm/ioctl/libdm-iface.c #define DM_RETRY_USLEEP_DELAY 200000 int dm_task_get_errno(struct dm_task *dmt) +-- +2.10.2 + diff --git a/lvm2-clvm.changes b/lvm2-clvm.changes index c751511..ce56a10 100644 --- a/lvm2-clvm.changes +++ b/lvm2-clvm.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Wed Apr 12 01:33:15 UTC 2017 - zren@suse.com + +- Update device mapper version to 1.02.138, see WHATS_NEW_DM for + detailed changelogs + * Drop obsolete lvmchange files accordingly +- Refresh libdm-iface-not-output-error-message-inside-retry-loop.patch +- Refresh make-mirror-legs-on-different-tag-pvs.patch +- device-mapper-dmsetup-export.patch + +------------------------------------------------------------------- +Mon Apr 10 23:08:45 UTC 2017 - jnelson-suse@jamponi.net + +- Version update to 2.02.169 release, see WHATS_NEW and WHATS_NEW_DM + files for detailed changelogs + ------------------------------------------------------------------- Mon Apr 10 10:41:02 UTC 2017 - tchvatal@suse.com diff --git a/lvm2-clvm.spec b/lvm2-clvm.spec index 2e5c9f6..3eb9aa9 100644 --- a/lvm2-clvm.spec +++ b/lvm2-clvm.spec @@ -19,8 +19,8 @@ %define dlm_version 3.99.1 %define sanlock_version 3.3.0 ### COMMON-DEF-BEGIN ### -%define lvm2_version 2.02.168 -%define device_mapper_version 1.02.137 +%define lvm2_version 2.02.169 +%define device_mapper_version 1.02.138 %define thin_provisioning_version 0.5.6 ### COMMON-DEF-END ### Name: lvm2-clvm diff --git a/lvm2.changes b/lvm2.changes index c751511..ce56a10 100644 --- a/lvm2.changes +++ b/lvm2.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Wed Apr 12 01:33:15 UTC 2017 - zren@suse.com + +- Update device mapper version to 1.02.138, see WHATS_NEW_DM for + detailed changelogs + * Drop obsolete lvmchange files accordingly +- Refresh libdm-iface-not-output-error-message-inside-retry-loop.patch +- Refresh make-mirror-legs-on-different-tag-pvs.patch +- device-mapper-dmsetup-export.patch + +------------------------------------------------------------------- +Mon Apr 10 23:08:45 UTC 2017 - jnelson-suse@jamponi.net + +- Version update to 2.02.169 release, see WHATS_NEW and WHATS_NEW_DM + files for detailed changelogs + ------------------------------------------------------------------- Mon Apr 10 10:41:02 UTC 2017 - tchvatal@suse.com diff --git a/lvm2.spec b/lvm2.spec index 4b52fab..bddb21a 100644 --- a/lvm2.spec +++ b/lvm2.spec @@ -20,8 +20,8 @@ %define applib liblvm2app2_2 %define cmdlib liblvm2cmd2_02 ### COMMON-DEF-BEGIN ### -%define lvm2_version 2.02.168 -%define device_mapper_version 1.02.137 +%define lvm2_version 2.02.169 +%define device_mapper_version 1.02.138 %define thin_provisioning_version 0.5.6 ### COMMON-DEF-END ### Name: lvm2 @@ -282,7 +282,6 @@ popd %{_sbindir}/lvcreate %{_sbindir}/lvdisplay %{_sbindir}/lvextend -%{_sbindir}/lvmchange %{_sbindir}/lvmdiskscan %{_sbindir}/lvmsadc %{_sbindir}/lvmsar @@ -336,7 +335,6 @@ popd /sbin/lvcreate /sbin/lvdisplay /sbin/lvextend -/sbin/lvmchange /sbin/lvmdiskscan /sbin/lvmsadc /sbin/lvmsar @@ -391,7 +389,6 @@ popd %{_mandir}/man8/lvm-config.8%{ext_man} %{_mandir}/man8/lvmconfig.8%{ext_man} %{_mandir}/man8/lvm-dumpconfig.8%{ext_man} -%{_mandir}/man8/lvmchange.8%{ext_man} %{_mandir}/man8/lvmconf.8%{ext_man} %{_mandir}/man8/lvmdiskscan.8%{ext_man} %{_mandir}/man8/lvmdump.8%{ext_man} diff --git a/make-mirror-legs-on-different-tag-pvs.patch b/make-mirror-legs-on-different-tag-pvs.patch index da2be53..0233af4 100644 --- a/make-mirror-legs-on-different-tag-pvs.patch +++ b/make-mirror-legs-on-different-tag-pvs.patch @@ -1,10 +1,10 @@ -From 49a5da732c74b8b96bc123a541d590c4fd06d7af Mon Sep 17 00:00:00 2001 -From: Guangliang Zhao -Date: Mon, 12 Nov 2012 15:28:11 +0800 -Subject: [PATCH 1/2] mirror: make mirror legs on different tag pvs +From b17f2ae4334f9233a88d7a2fcae325f86691beb0 Mon Sep 17 00:00:00 2001 +From: Eric Ren +Date: Tue, 11 Apr 2017 10:44:30 +0800 +Subject: [PATCH] [PATCH 1/2] mirror: make mirror legs on different tag pvs -The mirror legs could be placed on the PVs(with different -tags) from the other mirror legs with this patch. +The mirror legs could be placed on the PVs(with different tags) +from the other mirror legs with this patch. The lvcreate allocates the replica "randomly" when creating a mirrored logical volume now, so it could happen that both @@ -17,18 +17,19 @@ finding areas for parallel space, so that mirror legs will always be placed on pvs with differnt tags. Signed-off-by: Guangliang Zhao +Fix-conflict-by: Eric Ren --- - conf/example.conf.in | 17 +++++++++++++++++ - lib/config/config_settings.h | 3 +++ - lib/config/defaults.h | 1 + - lib/metadata/lv_manip.c | 35 +++++++++++++++++++++++++++++++++++ - man/lvcreate.8.in | 4 ++++ - 5 files changed, 60 insertions(+) + conf/example.conf.in | 17 +++++++++++++++++ + lib/config/config_settings.h | 5 ++++- + lib/config/defaults.h | 1 + + lib/metadata/lv_manip.c | 35 +++++++++++++++++++++++++++++++++++ + man/lvcreate.8_pregen | 7 +++++++ + 5 files changed, 64 insertions(+), 1 deletion(-) -Index: LVM2.2.02.165/conf/example.conf.in -=================================================================== ---- LVM2.2.02.165.orig/conf/example.conf.in -+++ LVM2.2.02.165/conf/example.conf.in +diff --git a/conf/example.conf.in b/conf/example.conf.in +index 614ce53..b33289f 100644 +--- a/conf/example.conf.in ++++ b/conf/example.conf.in @@ -372,6 +372,23 @@ allocation { # or erased unless the --wipesignatures option is used directly. wipe_signatures_when_zeroing_new_lvs = 1 @@ -53,25 +54,27 @@ Index: LVM2.2.02.165/conf/example.conf.in # Configuration option allocation/mirror_logs_require_separate_pvs. # Mirror logs and images will always use different PVs. # The default setting changed in version 2.02.85. -Index: LVM2.2.02.165/lib/config/config_settings.h -=================================================================== ---- LVM2.2.02.165.orig/lib/config/config_settings.h -+++ LVM2.2.02.165/lib/config/config_settings.h -@@ -473,6 +473,9 @@ cfg(allocation_raid_stripe_all_devices_C +diff --git a/lib/config/config_settings.h b/lib/config/config_settings.h +index b701722..0e5a5e2 100644 +--- a/lib/config/config_settings.h ++++ b/lib/config/config_settings.h +@@ -473,7 +473,10 @@ cfg(allocation_raid_stripe_all_devices_CFG, "raid_stripe_all_devices", allocatio "when the command does not specify the number of stripes to use.\n" "This was the default behaviour until release 2.02.162.\n") +-cfg(allocation_cache_pool_metadata_require_separate_pvs_CFG, "cache_pool_metadata_require_separate_pvs", allocation_CFG_SECTION, CFG_PROFILABLE | CFG_PROFILABLE_METADATA, CFG_TYPE_BOOL, DEFAULT_CACHE_POOL_METADATA_REQUIRE_SEPARATE_PVS, vsn(2, 2, 106), NULL, 0, NULL, +cfg(allocation_mirror_legs_require_separate_pvs_CFG, "mirror_legs_require_separate_pvs", allocation_CFG_SECTION, 0, CFG_TYPE_BOOL, DEFAULT_MIRROR_LEGS_REQUIRE_SEPARATE_PVS, vsn(2, 2, 98), NULL, 0, NULL, + "Mirror legs will always use different PVs.\n") + - cfg(allocation_cache_pool_metadata_require_separate_pvs_CFG, "cache_pool_metadata_require_separate_pvs", allocation_CFG_SECTION, 0, CFG_TYPE_BOOL, DEFAULT_CACHE_POOL_METADATA_REQUIRE_SEPARATE_PVS, vsn(2, 2, 106), NULL, 0, NULL, ++cfg(allocation_cache_pool_metadata_require_separate_pvs_CFG, "cache_pool_metadata_require_separate_pvs", allocation_CFG_SECTION, 0, CFG_TYPE_BOOL, DEFAULT_CACHE_POOL_METADATA_REQUIRE_SEPARATE_PVS, vsn(2, 2, 106), NULL, 0, NULL, "Cache pool metadata and data will always use different PVs.\n") -Index: LVM2.2.02.165/lib/config/defaults.h -=================================================================== ---- LVM2.2.02.165.orig/lib/config/defaults.h -+++ LVM2.2.02.165/lib/config/defaults.h -@@ -158,6 +158,7 @@ + cfg(allocation_cache_pool_cachemode_CFG, "cache_pool_cachemode", allocation_CFG_SECTION, CFG_PROFILABLE | CFG_PROFILABLE_METADATA | CFG_DEFAULT_COMMENTED, CFG_TYPE_STRING, DEFAULT_CACHE_MODE, vsn(2, 2, 113), NULL, vsn(2, 2, 128), +diff --git a/lib/config/defaults.h b/lib/config/defaults.h +index 2340636..256fab6 100644 +--- a/lib/config/defaults.h ++++ b/lib/config/defaults.h +@@ -159,6 +159,7 @@ #define DEFAULT_MAX_LV 0 #define DEFAULT_ALLOC_POLICY ALLOC_NORMAL #define DEFAULT_MIRROR_LOGS_REQUIRE_SEPARATE_PVS 0 @@ -79,11 +82,11 @@ Index: LVM2.2.02.165/lib/config/defaults.h #define DEFAULT_MAXIMISE_CLING 1 #define DEFAULT_CLUSTERED 0 -Index: LVM2.2.02.165/lib/metadata/lv_manip.c -=================================================================== ---- LVM2.2.02.165.orig/lib/metadata/lv_manip.c -+++ LVM2.2.02.165/lib/metadata/lv_manip.c -@@ -1519,6 +1519,9 @@ struct alloc_handle { +diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c +index 0dfbad4..357e46a 100644 +--- a/lib/metadata/lv_manip.c ++++ b/lib/metadata/lv_manip.c +@@ -1622,6 +1622,9 @@ struct alloc_handle { unsigned maximise_cling; unsigned mirror_logs_separate; /* Force mirror logs on separate PVs? */ @@ -93,7 +96,7 @@ Index: LVM2.2.02.165/lib/metadata/lv_manip.c /* * RAID devices require a metadata area that accompanies each -@@ -2633,6 +2636,32 @@ static int _limit_to_one_area_per_tag(st +@@ -2736,6 +2739,32 @@ static int _limit_to_one_area_per_tag(struct alloc_handle *ah, struct alloc_stat } /* @@ -126,7 +129,7 @@ Index: LVM2.2.02.165/lib/metadata/lv_manip.c * Returns 1 regardless of whether any space was found, except on error. */ static int _find_some_parallel_space(struct alloc_handle *ah, -@@ -2762,6 +2791,10 @@ static int _find_some_parallel_space(str +@@ -2865,6 +2894,10 @@ static int _find_some_parallel_space(struct alloc_handle *ah, continue; case USE_AREA: @@ -137,7 +140,7 @@ Index: LVM2.2.02.165/lib/metadata/lv_manip.c /* * Except with ALLOC_ANYWHERE, replace first area with this * one which is smaller but still big enough. -@@ -3243,6 +3276,7 @@ static struct alloc_handle *_alloc_init( +@@ -3355,6 +3388,7 @@ static struct alloc_handle *_alloc_init(struct cmd_context *cmd, ah->parity_count = parity_count; ah->region_size = region_size; ah->alloc = alloc; @@ -145,7 +148,7 @@ Index: LVM2.2.02.165/lib/metadata/lv_manip.c /* * For the purposes of allocation, area_count and parity_count are -@@ -3254,6 +3288,7 @@ static struct alloc_handle *_alloc_init( +@@ -3366,6 +3400,7 @@ static struct alloc_handle *_alloc_init(struct cmd_context *cmd, ah->area_multiple = _calc_area_multiple(segtype, area_count + parity_count, stripes); //FIXME: s/mirror_logs_separate/metadata_separate/ so it can be used by others? ah->mirror_logs_separate = find_config_tree_bool(cmd, allocation_mirror_logs_require_separate_pvs_CFG, NULL); @@ -153,18 +156,24 @@ Index: LVM2.2.02.165/lib/metadata/lv_manip.c if (mirrors || stripes) total_extents = new_extents; -Index: LVM2.2.02.165/man/lvcreate.8.in -=================================================================== ---- LVM2.2.02.165.orig/man/lvcreate.8.in -+++ LVM2.2.02.165/man/lvcreate.8.in -@@ -418,6 +418,10 @@ Using \fBcore\fP means the mirror is reg - from the first device each time the logical volume is activated, - like after every reboot. +diff --git a/man/lvcreate.8_pregen b/man/lvcreate.8_pregen +index 6663087..c385927 100644 +--- a/man/lvcreate.8_pregen ++++ b/man/lvcreate.8_pregen +@@ -416,6 +416,13 @@ Create a raid10 LV. + [ \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT] ] + .ad b .br +Every leg of the mirrored logical volume could be placed on the pvs with +same tag, see details(mirror_legs_require_separate_pvs) in lvm.conf. + +.br - Using \fBmirrored\fP will create a persistent log that is itself mirrored. - . - .HP ++Using \fBmirrored\fP will create a persistent log that is itself mirrored. ++. ++.HP + .ad l + [ \fB-R\fP|\fB--regionsize\fP \fISize\fP[m|UNIT] ] + .ad b +-- +2.10.2 + From 917229d6d3827cab633768d1e6a53d744bfc281f6e946c51330c822991debc42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 18 Apr 2017 11:15:17 +0000 Subject: [PATCH 7/7] - Update to 2.02.170: * Few smal fixes around; obsoleted 169 release that was removed from mirrors - Refresh patch: * display-dm-name-for-lv-name.diff - Update to 2.02.170: * Few smal fixes around; obsoleted 169 release that was removed from mirrors - Refresh patch: * display-dm-name-for-lv-name.diff - Update to 2.02.170: * Few smal fixes around; obsoleted 169 release that was removed from mirrors - Refresh patch: * display-dm-name-for-lv-name.diff OBS-URL: https://build.opensuse.org/package/show/Base:System/lvm2?expand=0&rev=178 --- LVM2.2.02.169.tgz | 3 --- LVM2.2.02.169.tgz.asc | 7 ------- LVM2.2.02.170.tgz | 3 +++ LVM2.2.02.170.tgz.asc | 7 +++++++ device-mapper.changes | 9 +++++++++ device-mapper.spec | 4 ++-- display-dm-name-for-lv-name.diff | 26 +++++++++++++------------- lvm2-clvm.changes | 9 +++++++++ lvm2-clvm.spec | 4 ++-- lvm2.changes | 9 +++++++++ lvm2.spec | 4 ++-- 11 files changed, 56 insertions(+), 29 deletions(-) delete mode 100644 LVM2.2.02.169.tgz delete mode 100644 LVM2.2.02.169.tgz.asc create mode 100644 LVM2.2.02.170.tgz create mode 100644 LVM2.2.02.170.tgz.asc diff --git a/LVM2.2.02.169.tgz b/LVM2.2.02.169.tgz deleted file mode 100644 index 0231063..0000000 --- a/LVM2.2.02.169.tgz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:757d2eb736e5f6ba1c78428400cd0dfdaf68344fd93d0c009cb6c11b4b97eb4a -size 2328589 diff --git a/LVM2.2.02.169.tgz.asc b/LVM2.2.02.169.tgz.asc deleted file mode 100644 index 55e8faa..0000000 --- a/LVM2.2.02.169.tgz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) - -iEYEABECAAYFAljafgEACgkQIoGRwVZ+LBeo5wCfVaQeSN73FPcJf86c3aqrFmZu -Rs0AoJ6l75QbY2V55rhunJvwwDllKlpF -=0Jtt ------END PGP SIGNATURE----- diff --git a/LVM2.2.02.170.tgz b/LVM2.2.02.170.tgz new file mode 100644 index 0000000..9887315 --- /dev/null +++ b/LVM2.2.02.170.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9372d2523027a751cf54eafdf8b761ff843969520c32b0c50abfba65e23d0d40 +size 2329694 diff --git a/LVM2.2.02.170.tgz.asc b/LVM2.2.02.170.tgz.asc new file mode 100644 index 0000000..334313d --- /dev/null +++ b/LVM2.2.02.170.tgz.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.14 (GNU/Linux) + +iEYEABECAAYFAljuyYIACgkQIoGRwVZ+LBf6MgCbBRfOPhmawTE3HPwPZNORFXyU +UuMAoN38fO4+j+w4c8xYF9P5Wl3FYrGi +=TbpB +-----END PGP SIGNATURE----- diff --git a/device-mapper.changes b/device-mapper.changes index ce56a10..e97074c 100644 --- a/device-mapper.changes +++ b/device-mapper.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Apr 18 11:07:01 UTC 2017 - tchvatal@suse.com + +- Update to 2.02.170: + * Few smal fixes around; obsoleted 169 release that was removed + from mirrors +- Refresh patch: + * display-dm-name-for-lv-name.diff + ------------------------------------------------------------------- Wed Apr 12 01:33:15 UTC 2017 - zren@suse.com diff --git a/device-mapper.spec b/device-mapper.spec index 13978c0..e3a43eb 100644 --- a/device-mapper.spec +++ b/device-mapper.spec @@ -19,8 +19,8 @@ %define libname libdevmapper1_03 %define libname_event libdevmapper-event1_03 ### COMMON-DEF-BEGIN ### -%define lvm2_version 2.02.169 -%define device_mapper_version 1.02.138 +%define lvm2_version 2.02.170 +%define device_mapper_version 1.02.139 %define thin_provisioning_version 0.5.6 ### COMMON-DEF-END ### Name: device-mapper diff --git a/display-dm-name-for-lv-name.diff b/display-dm-name-for-lv-name.diff index a33bd51..135e0cc 100644 --- a/display-dm-name-for-lv-name.diff +++ b/display-dm-name-for-lv-name.diff @@ -4,13 +4,13 @@ lib/display/display.c | 13 +++++++++---- 3 files changed, 13 insertions(+), 4 deletions(-) -Index: LVM2.2.02.139/lib/config/config_settings.h +Index: LVM2.2.02.170/lib/config/config_settings.h =================================================================== ---- LVM2.2.02.139.orig/lib/config/config_settings.h -+++ LVM2.2.02.139/lib/config/config_settings.h -@@ -947,6 +947,9 @@ cfg_array(global_cache_check_options_CFG - cfg_array(global_cache_repair_options_CFG, "cache_repair_options", global_CFG_SECTION, CFG_ALLOW_EMPTY | CFG_DEFAULT_COMMENTED, CFG_TYPE_STRING, DEFAULT_CACHE_REPAIR_OPTIONS_CONFIG, vsn(2, 2, 108), NULL, 0, NULL, - "List of options passed to the cache_repair command.\n") +--- LVM2.2.02.170.orig/lib/config/config_settings.h ++++ LVM2.2.02.170/lib/config/config_settings.h +@@ -1039,6 +1039,9 @@ cfg(global_fsadm_executable_CFG, "fsadm_ + "The full path to the fsadm command.\n" + "LVM uses this command to help with lvresize -r operations.\n") +cfg(global_display_dm_name_for_lv_name_CFG, "display_dm_name_for_lv_name", global_CFG_SECTION, CFG_DEFAULT_COMMENTED, CFG_TYPE_BOOL, DEFAULT_DISPLAY_DM_NAME_FOR_LV_NAME, vsn(2, 2, 98), NULL, 0, NULL, + "Display dm name for lv name.\n") @@ -18,10 +18,10 @@ Index: LVM2.2.02.139/lib/config/config_settings.h cfg(global_system_id_source_CFG, "system_id_source", global_CFG_SECTION, 0, CFG_TYPE_STRING, DEFAULT_SYSTEM_ID_SOURCE, vsn(2, 2, 117), NULL, 0, NULL, "The method LVM uses to set the local system ID.\n" "Volume Groups can also be given a system ID (by vgcreate, vgchange,\n" -Index: LVM2.2.02.139/lib/config/defaults.h +Index: LVM2.2.02.170/lib/config/defaults.h =================================================================== ---- LVM2.2.02.139.orig/lib/config/defaults.h -+++ LVM2.2.02.139/lib/config/defaults.h +--- LVM2.2.02.170.orig/lib/config/defaults.h ++++ LVM2.2.02.170/lib/config/defaults.h @@ -33,6 +33,7 @@ #define DEFAULT_OBTAIN_DEVICE_LIST_FROM_UDEV 1 #define DEFAULT_EXTERNAL_DEVICE_INFO_SOURCE "none" @@ -30,11 +30,11 @@ Index: LVM2.2.02.139/lib/config/defaults.h #define DEFAULT_MD_COMPONENT_DETECTION 1 #define DEFAULT_FW_RAID_COMPONENT_DETECTION 0 #define DEFAULT_MD_CHUNK_ALIGNMENT 1 -Index: LVM2.2.02.139/lib/display/display.c +Index: LVM2.2.02.170/lib/display/display.c =================================================================== ---- LVM2.2.02.139.orig/lib/display/display.c -+++ LVM2.2.02.139/lib/display/display.c -@@ -371,10 +371,15 @@ int lvdisplay_full(struct cmd_context *c +--- LVM2.2.02.170.orig/lib/display/display.c ++++ LVM2.2.02.170/lib/display/display.c +@@ -413,10 +413,15 @@ int lvdisplay_full(struct cmd_context *c lv->vg->cmd->dev_dir, lv->vg->name, lv->name); else if (lv_is_visible(lv)) { /* Thin pool does not have /dev/vg/name link */ diff --git a/lvm2-clvm.changes b/lvm2-clvm.changes index ce56a10..e97074c 100644 --- a/lvm2-clvm.changes +++ b/lvm2-clvm.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Apr 18 11:07:01 UTC 2017 - tchvatal@suse.com + +- Update to 2.02.170: + * Few smal fixes around; obsoleted 169 release that was removed + from mirrors +- Refresh patch: + * display-dm-name-for-lv-name.diff + ------------------------------------------------------------------- Wed Apr 12 01:33:15 UTC 2017 - zren@suse.com diff --git a/lvm2-clvm.spec b/lvm2-clvm.spec index 3eb9aa9..668cf9d 100644 --- a/lvm2-clvm.spec +++ b/lvm2-clvm.spec @@ -19,8 +19,8 @@ %define dlm_version 3.99.1 %define sanlock_version 3.3.0 ### COMMON-DEF-BEGIN ### -%define lvm2_version 2.02.169 -%define device_mapper_version 1.02.138 +%define lvm2_version 2.02.170 +%define device_mapper_version 1.02.139 %define thin_provisioning_version 0.5.6 ### COMMON-DEF-END ### Name: lvm2-clvm diff --git a/lvm2.changes b/lvm2.changes index ce56a10..e97074c 100644 --- a/lvm2.changes +++ b/lvm2.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Apr 18 11:07:01 UTC 2017 - tchvatal@suse.com + +- Update to 2.02.170: + * Few smal fixes around; obsoleted 169 release that was removed + from mirrors +- Refresh patch: + * display-dm-name-for-lv-name.diff + ------------------------------------------------------------------- Wed Apr 12 01:33:15 UTC 2017 - zren@suse.com diff --git a/lvm2.spec b/lvm2.spec index bddb21a..a2360ff 100644 --- a/lvm2.spec +++ b/lvm2.spec @@ -20,8 +20,8 @@ %define applib liblvm2app2_2 %define cmdlib liblvm2cmd2_02 ### COMMON-DEF-BEGIN ### -%define lvm2_version 2.02.169 -%define device_mapper_version 1.02.138 +%define lvm2_version 2.02.170 +%define device_mapper_version 1.02.139 %define thin_provisioning_version 0.5.6 ### COMMON-DEF-END ### Name: lvm2