rpm/lvm2
SHA256
1
0
Fork 0
forked from pool/lvm2
Code Pull Requests Activity
1c7cea6733
lvm2/lvm2.spec
Tomáš Chvátal 1c7cea6733 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 <zren@suse.com>
+Date: Tue, 11 Apr 2017 10:58:56 +0800
+Subject: [PATCH] DM: add dmsetup export
+
+bsc#479104
+
+Patch-refreshed-by: Eric Ren <zren@suse.com>
+---
+ 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 <options>] [<device>]", 0, -1, 1, 0, _deps},
- 	{"stats", "<command> [<options>] [<devices>]", 1, -1, 1, 1, _stats},
- 	{"status", "[<device>] [--noflush] [--target <target_type>]", 0, -1, 1, 0, _status},
+@@ -5904,7 +6027,11 @@ static struct command _dmsetup_commands[
+ 	{"deps", "[-o <options>] [<device>...]", 0, -1, 1, 0, _deps},
+ 	{"stats", "<command> [<options>] [<device>...]", 1, -1, 1, 1, _stats},
+ 	{"status", "[<device>...] [--noflush] [--target <target_type>]", 0, -1, 1, 0, _status},
+-	{"table", "[<device>...] [--target <target_type>] [--showkeys]", 0, -1, 1, 0, _status},
++	{"deps", "[-o <options>] [<device>]", 0, -1, 1, 0, _deps},
++	{"stats", "<command> [<options>] [<devices>]", 1, -1, 1, 1, _stats},
++	{"status", "[<device>] [--noflush] [--target <target_type>]", 0, -1, 1, 0, _status},
 +	{"export", "[<device>]", 0, -1, 1, 0, _export},
- 	{"table", "[<device>] [--target <target_type>] [--showkeys]", 0, -1, 1, 0, _status},
++	{"table", "[<device>] [--target <target_type>] [--showkeys]", 0, -1, 1, 0, _status},
  	{"wait", "<device> [<event_nr>] [--noflush]", 0, 2, 0, 0, _wait},
- 	{"mknodes", "[<device>]", 0, -1, 1, 0, _mknodes},
+ 	{"mknodes", "[<device>...]", 0, -1, 1, 0, _mknodes},
+ 	{"mangle", "[<device>...]", 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 <lwang@suse.com>
-Date: Mon, 23 Nov 2015 13:49:39 +0800
+From 3c4d9dd3571e89545d97c8421fd4cbdbaa6895b8 Mon Sep 17 00:00:00 2001
+From: Eric Ren <zren@suse.com>
+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 <zren@suse.com>
 ---
- 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 <gzhao@suse.com>
-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 <zren@suse.com>
+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 <gzhao@suse.com>
+Fix-conflict-by: Eric Ren <zren@suse.com>
 ---
- 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
2017-04-18 10:55:18 +00:00

552 lines
16 KiB
RPMSpec
Raw Blame History

#
# spec file for package lvm2
#
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
%define _udevdir %(pkg-config --variable=udevdir udev)
%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 thin_provisioning_version 0.5.6
### COMMON-DEF-END ###
Name: lvm2
Version: %{lvm2_version}
Release: 0
Summary: Logical Volume Manager Tools
License: GPL-2.0+ and LGPL-2.1+
Group: System/Base
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
Patch1001: improve_probing.diff
Patch1002: no-inc-audit.diff
#bsc#952300
Patch1004: sys_mount_instead_linux_fs.diff
Patch1005: display-dm-name-for-lv-name.diff
Patch1006: device-mapper-type_punning.diff
#fate312248, patch7,8
Patch1007: make-mirror-legs-on-different-tag-pvs.patch
Patch1008: improve-mirror-legs-on-different-tag-pvs.patch
#fate#315092
Patch1009: cmirrord_improvment_performance.patch
#fate#314367, patch10,11
Patch1010: cluster_support_mirrord_log.diff
Patch1011: lvconvert-cluster-mirrored-disk-failed.patch
#forward-port from sle11
Patch1012: suppress_format1_size_warning.diff
Patch1013: pvmove_support_clustered_vg.diff
# Never upstream
Patch1014: cmirrord_remove_date_time_from_compilation.patch
#bnc873538
Patch1015: fix-closedown-before-thread-finish.patch
#bnc#870824
Patch1016: use-mirrortype-asdefault-whenclvmdrunning.patch
Patch1017: version-plugins-in-libdir.patch
#bsc#935623
Patch1018: dmeventd-fix-dso-name-wrong-compare.patch
#bsc#960044
Patch1019: lvm2-lvmetad.service-add-Also-lvm2-lvmetad.socket.patch
#bsc#479104,bnc#707253
Patch2000: device-mapper-dmsetup-export.patch
Patch2001: device-mapper-gcc-warnings.patch
Patch2002: device-mapper-link.patch
#bnc#78902,bnc#789019,bnc#789020
Patch2003: udev_rules-update.diff
#bnc#875233
Patch2004: udev-Check-for-DM_NR_VALID_PATHS.patch
#FATE#318413
Patch2005: fsadm-add-support-for-btrfs.patch
#bnc909358
Patch2006: Import-ID_FS_XXX-variables-bnc909358.patch
#bsc#932300
Patch2007: 10-dm.rules-Reset-state-variable-for-spurious-events.patch
#bsc#940298
Patch2008: libdm-iface-not-output-error-message-inside-retry-loop.patch
#bnc#960744
Patch2009: pvcreate-enhance-the-error-message.patch
#bnc#990538,bnc#986734
Patch2010: 69-dm-lvm-metad.rules-Do-not-process-rules-for-multi.patch
#bnc#950089
Patch2011: lvm2-testsuite.patch
#bsc#1012973
Patch2012: simplify-special-case-for-md-in-69-dm-lvm-metadata.patch
### COMMON-PATCH-END ###
%description
Programs and man pages for configuring and using the LVM2 Logical
Volume Manager.
%prep
%setup -q -n LVM2.%{version}
### COMMON-PREP-BEGIN ###
%patch1001 -p1
%patch1002 -p1
%patch1004 -p1
%patch1005 -p1
%patch1006 -p1
%patch1007 -p1
%patch1008 -p1
%patch1009 -p1
%patch1010 -p1
%patch1011 -p1
%patch1012 -p1
%patch1013 -p1
%patch1014 -p1
%patch1015 -p1
%patch1016 -p1
%patch1017 -p1
%patch1018 -p1
%patch1019 -p1
%patch2000 -p1
%patch2001 -p1
%patch2002 -p1
%patch2003 -p1
%patch2004 -p1
%patch2005 -p1
%patch2006 -p1
%patch2007 -p1
%patch2008 -p1
%patch2009 -p1
%patch2010 -p1
%patch2011 -p1
%patch2012 -p1
### COMMON-PREP-END ###
%build
extra_opts="
--enable-applib
--enable-blkid_wiping
--enable-cmdlib
--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
"
### COMMON-CONFIG-BEGIN ###
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 \
--with-udev-prefix="%{_prefix}/" \
--enable-selinux \
--enable-pkgconfig \
--with-usrlibdir=%{_libdir} \
--with-usrsbindir=%{_sbindir} \
--with-default-dm-run-dir=/run \
--with-tmpfilesdir=%{_tmpfilesdir} \
--with-thin=internal \
--with-device-gid=6 \
--with-device-mode=0640 \
--with-device-uid=0 \
--with-dmeventd-path=%{_sbindir}/dmeventd \
--with-thin-check=%{_sbindir}/thin_check \
--with-thin-dump=%{_sbindir}/thin_dump \
--with-thin-repair=%{_sbindir}/thin_repair \
$extra_opts
### COMMON-CONFIG-END ###
make %{?_smp_mflags}
%install
%make_install
make install_system_dirs DESTDIR=%{buildroot}
make install_systemd_units DESTDIR=%{buildroot}
make install_systemd_generators DESTDIR=%{buildroot}
make install_tmpfiles_configuration DESTDIR=%{buildroot}
# Install configuration file
install -m 644 %{SOURCE1} "%{buildroot}/%{_sysconfdir}/lvm/"
# Install testsuite
make -C test install DESTDIR=%{buildroot}
pushd "%{buildroot}/%{_libdir}"
ln -sf liblvm2cmd.so.2.02 liblvm2cmd.so
ln -sf liblvm2app.so.2.2 liblvm2app.so
for i in libdevmapper-event-lvm2{mirror,raid,snapshot,thin}; do
ln -sf "device-mapper/$i.so" "$i.so"
ln -sf "device-mapper/$i.so" "$i.so.2.02"
done
popd
#rc compat symlinks
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
rm %{buildroot}%{_sbindir}/dmeventd
rm %{buildroot}%{_sbindir}/dmstats
rm %{buildroot}%{_mandir}/man8/dmstats.8
rm %{buildroot}%{_mandir}/man8/dmsetup.8
rm %{buildroot}%{_mandir}/man8/dmeventd.8
rm %{buildroot}%{_udevrulesdir}/10-dm.rules
rm %{buildroot}%{_udevrulesdir}/13-dm-disk.rules
rm %{buildroot}%{_udevrulesdir}/95-dm-notify.rules
rm %{buildroot}%{_unitdir}/dm-event.socket
rm %{buildroot}%{_unitdir}/dm-event.service
rm %{buildroot}%{_libdir}/libdevmapper.so.1.03
rm %{buildroot}%{_libdir}/libdevmapper-event.so.1.03
rm %{buildroot}%{_libdir}/libdevmapper.so
rm %{buildroot}%{_libdir}/libdevmapper-event.so
rm %{buildroot}%{_includedir}/libdevmapper*.h
rm %{buildroot}%{_libdir}/pkgconfig/devmapper*.pc
# compat symlinks in /sbin remove with Leap 43
mkdir -p %{buildroot}/sbin
pushd %{buildroot}/%{_sbindir}
for i in {vg,pv,lv}*; do
ln -s %{_sbindir}/$i %{buildroot}/sbin/$i
done
popd
%pre
%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 lvm2-lvmpolld.service lvm2-lvmpolld.socket
# Use %%tmpfiles_create when 13.2 is oldest in support scope
%{_bindir}/systemd-tmpfiles --create %{_tmpfilesdir}/lvm2.conf || :
%posttrans
%{?regenerate_initrd_posttrans}
%preun
%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 lvm2-lvmpolld.service lvm2-lvmpolld.socket
%files
%defattr(-,root,root)
%doc README VERSION WHATS_NEW
%doc doc/lvm_fault_handling.txt
# Main binaries
%{_sbindir}/blkdeactivate
%{_sbindir}/fsadm
%{_sbindir}/lvm
%{_sbindir}/lvmconf
%{_sbindir}/lvmconfig
%{_sbindir}/lvmdump
%{_sbindir}/lvmetad
%{_sbindir}/lvmpolld
# Other files
%{_sbindir}/lvchange
%{_sbindir}/lvconvert
%{_sbindir}/lvcreate
%{_sbindir}/lvdisplay
%{_sbindir}/lvextend
%{_sbindir}/lvmdiskscan
%{_sbindir}/lvmsadc
%{_sbindir}/lvmsar
%{_sbindir}/lvreduce
%{_sbindir}/lvremove
%{_sbindir}/lvrename
%{_sbindir}/lvresize
%{_sbindir}/lvs
%{_sbindir}/lvscan
%{_sbindir}/pvchange
%{_sbindir}/pvck
%{_sbindir}/pvcreate
%{_sbindir}/pvdisplay
%{_sbindir}/pvmove
%{_sbindir}/pvremove
%{_sbindir}/pvresize
%{_sbindir}/pvs
%{_sbindir}/pvscan
%{_sbindir}/vgcfgbackup
%{_sbindir}/vgcfgrestore
%{_sbindir}/vgchange
%{_sbindir}/vgck
%{_sbindir}/vgconvert
%{_sbindir}/vgcreate
%{_sbindir}/vgdisplay
%{_sbindir}/vgexport
%{_sbindir}/vgextend
%{_sbindir}/vgimport
%{_sbindir}/vgimportclone
%{_sbindir}/vgmerge
%{_sbindir}/vgmknodes
%{_sbindir}/vgreduce
%{_sbindir}/vgremove
%{_sbindir}/vgrename
%{_sbindir}/vgs
%{_sbindir}/vgscan
%{_sbindir}/vgsplit
%{_sbindir}/rcblk-availability
%{_sbindir}/rclvm2-lvmetad
%{_sbindir}/rclvm2-lvmpolld
%{_sbindir}/rclvm2-monitor
# compat symlinks in /sbin
/sbin/lvm
/sbin/lvmconf
/sbin/lvmconfig
/sbin/lvmdump
/sbin/lvmetad
/sbin/lvmpolld
/sbin/lvchange
/sbin/lvconvert
/sbin/lvcreate
/sbin/lvdisplay
/sbin/lvextend
/sbin/lvmdiskscan
/sbin/lvmsadc
/sbin/lvmsar
/sbin/lvreduce
/sbin/lvremove
/sbin/lvrename
/sbin/lvresize
/sbin/lvs
/sbin/lvscan
/sbin/pvchange
/sbin/pvck
/sbin/pvcreate
/sbin/pvdisplay
/sbin/pvmove
/sbin/pvremove
/sbin/pvresize
/sbin/pvs
/sbin/pvscan
/sbin/vgcfgbackup
/sbin/vgcfgrestore
/sbin/vgchange
/sbin/vgck
/sbin/vgconvert
/sbin/vgcreate
/sbin/vgdisplay
/sbin/vgexport
/sbin/vgextend
/sbin/vgimport
/sbin/vgimportclone
/sbin/vgmerge
/sbin/vgmknodes
/sbin/vgreduce
/sbin/vgremove
/sbin/vgrename
/sbin/vgs
/sbin/vgscan
/sbin/vgsplit
%{_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/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/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
%config(noreplace) %{_sysconfdir}/lvm/lvm.conf
%config(noreplace) %{_sysconfdir}/lvm/lvmlocal.conf
%dir %{_sysconfdir}/lvm/profile
%{_sysconfdir}/lvm/profile/command_profile_template.profile
%{_sysconfdir}/lvm/profile/metadata_profile_template.profile
%{_sysconfdir}/lvm/profile/thin-generic.profile
%{_sysconfdir}/lvm/profile/thin-performance.profile
%{_sysconfdir}/lvm/profile/cache-mq.profile
%{_sysconfdir}/lvm/profile/cache-smq.profile
%{_sysconfdir}/lvm/profile/lvmdbusd.profile
%dir %{_sysconfdir}/lvm/cache
%ghost %{_sysconfdir}/lvm/cache/.cache
%dir %{_sysconfdir}/lvm/archive
%dir %{_sysconfdir}/lvm/backup
%ghost %dir /run/lock/lvm
%ghost %dir /run/lvm
%{_tmpfilesdir}/%{name}.conf
%{_unitdir}/blk-availability.service
%{_unitdir}/lvm2-monitor.service
%{_unitdir}/lvm2-lvmetad.socket
%{_unitdir}/lvm2-lvmetad.service
%{_unitdir}/lvm2-pvscan@.service
%{_unitdir}/lvm2-lvmpolld.socket
%{_unitdir}/lvm2-lvmpolld.service
%{_libexecdir}/systemd/system-generators/lvm2-activation-generator
%dir %{_libdir}/device-mapper
%{_libdir}/device-mapper/libdevmapper-event-lvm2*.so
%{_libdir}/libdevmapper-event-lvm2*.so
%{_libdir}/libdevmapper-event-lvm2*.so.2.02
##############################################################################
# LVM2 application api library
##############################################################################
%package -n %{applib}
Summary: LVM2 application api library
Group: System/Libraries
Conflicts: %{name} < %{version}
%description -n %{applib}
LVM library for applications api
%post -n %{applib} -p /sbin/ldconfig
%postun -n %{applib} -p /sbin/ldconfig
%files -n %{applib}
%defattr(-,root,root)
%{_libdir}/liblvm2app.so.*
##############################################################################
# LVM2 command line library
##############################################################################
%package -n %{cmdlib}
Summary: LVM2 command line library
Group: System/Libraries
Conflicts: %{name} < %{version}
%description -n %{cmdlib}
The lvm2 command line library allows building programs that manage
lvm devices without invoking a separate program.
%post -n %{cmdlib} -p /sbin/ldconfig
%postun -n %{cmdlib} -p /sbin/ldconfig
%files -n %{cmdlib}
%defattr(-,root,root)
%{_libdir}/liblvm2cmd.so.*
##############################################################################
# Development files for LVM2
##############################################################################
%package devel
Summary: Development files for LVM2
Group: Development/Libraries/C and C++
Requires: %{applib} = %{version}
Requires: %{cmdlib} = %{version}
Requires: lvm2 = %{version}
Recommends: device-mapper-devel
%description devel
This package provides development files for the LVM2 Logical Volume Manager.
%files devel
%defattr(-,root,root)
%{_includedir}/lvm2cmd.h
%{_includedir}/lvm2app.h
%{_libdir}/pkgconfig/lvm2app.pc
%{_libdir}/liblvm2app.so
%{_libdir}/liblvm2cmd.so
##############################################################################
# LVM2 Testsuite
##############################################################################
%package testsuite
Summary: LVM2 Testsuite
Group: Development/Libraries/C and C++
Requires: %{applib} = %{version}
Requires: %{cmdlib} = %{version}
Requires: lvm2 = %{version}
%description testsuite
An extensive functional testsuite for the LVM2 Logical Volume Manager.
%files testsuite
%defattr(-,root,root)
%{_datarootdir}/lvm2-testsuite/
%{_libexecdir}/lvm2-testsuite/
%{_bindir}/lvm2-testsuite
%changelog
View Git Blame Copy Permalink