From f898c9f5078ef79c7356b63b78cdcc6d06a00634 Mon Sep 17 00:00:00 2001
From: Marcin Krol <hawk@tld-linux.org>
Date: Sat, 3 Oct 2015 18:43:44 +0000
Subject: [PATCH] - updated for 2.02.132

---
 device-mapper-dmsetup-export.patch | 55 +++++++++++++++---------------
 lvm2-diet.patch                    |  5 +--
 2 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/device-mapper-dmsetup-export.patch b/device-mapper-dmsetup-export.patch
index d390bda..7ea1a4b 100644
--- a/device-mapper-dmsetup-export.patch
+++ b/device-mapper-dmsetup-export.patch
@@ -8,26 +8,27 @@ Index: LVM2.2.02.98/man/dmsetup.8.in
 --- LVM2.2.02.116.orig/man/dmsetup.8.in	2015-01-30 16:19:53.000000000 +0000
 +++ LVM2.2.02.116/man/dmsetup.8.in	2015-02-03 21:05:01.635601115 +0000
 @@ -19,6 +19,9 @@ dmsetup \(em low level logical volume ma
- .RI [ + ]< sectors >| auto | none ]
- .RE
- .br
-+.B dmsetup export
-+.I [ device_name ]
-+.br
- .B dmsetup deps
- .RB [ \-o
  .IR options ]
-@@ -309,6 +312,10 @@ device_name in subsequent dmsetup comman
- If successful a device will appear as
- /dev/mapper/<device-name>.
- See below for information on the table format.
-+.IP \fBexport
-+.I [ device_name ]
+ .RI [ device_name ]
+ .HP
++.B dmsetup export
++.RI [ device_name ]
++.HP
+ .B dmsetup help
+ .RB [ \-c | \-C | \-\-columns ]
+ .HP
+@@ -309,6 +312,11 @@ device_name in subsequent dmsetup comman
+ \fBblkdevname\fP (block device name),
+ \fBdevname\fP (map name for device-mapper devices, equal to blkdevname otherwise).
+ .HP
++.B export
++.RI [ device_name ]
 +.br
 +Outputs information in key/value format to be imported by other programs.
++.HP
+ .B help
+ .RB [ \-c | \-C | \-\-columns ]
  .br
- .TP
- .B deps
 Index: LVM2.2.02.98/tools/dmsetup.c
 ===================================================================
 --- LVM2.2.02.98.orig/tools/dmsetup.c
@@ -131,14 +132,14 @@ Index: LVM2.2.02.98/tools/dmsetup.c
  	int r = 0;
  	struct dm_task *dmt;
 @@ -3056,10 +3143,11 @@ static struct command _commands[] = {
- 	{"message", "<device> <sector> <message>", 2, -1, 0, _message},
- 	{"ls", "[--target <target_type>] [--exec <command>] [-o options] [--tree]", 0, 0, 0, _ls},
- 	{"info", "[<device>]", 0, -1, 1, _info},
- 	{"deps", "[-o options] [<device>]", 0, -1, 1, _deps},
- 	{"status", "[<device>] [--noflush] [--target <target_type>]", 0, -1, 1, _status},
-+	{"export", "[<device>]", 0, 1, 1, _export},
- 	{"table", "[<device>] [--target <target_type>] [--showkeys]", 0, -1, 1, _status},
- 	{"wait", "<device> [<event_nr>] [--noflush]", 0, 2, 0, _wait},
- 	{"mknodes", "[<device>]", 0, -1, 1, _mknodes},
- 	{"mangle", "[<device>]", 0, -1, 1, _mangle},
- 	{"udevcreatecookie", "", 0, 0, 0, _udevcreatecookie},
+ 	{"ls", "[--target <target_type>] [--exec <command>] [-o <options>] [--tree]", 0, 0, 0, 0, _ls},
+ 	{"info", "[<device>]", 0, -1, 1, 0, _info},
+ 	{"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},
+ 	{"wait", "<device> [<event_nr>] [--noflush]", 0, 2, 0, 0, _wait},
+ 	{"mknodes", "[<device>]", 0, -1, 1, 0, _mknodes},
+ 	{"mangle", "[<device>]", 0, -1, 1, 0, _mangle},
+ 	{"udevcreatecookie", "", 0, 0, 0, 0, _udevcreatecookie},
diff --git a/lvm2-diet.patch b/lvm2-diet.patch
index abf8df3..1799ebc 100644
--- a/lvm2-diet.patch
+++ b/lvm2-diet.patch
@@ -128,8 +128,8 @@
 
 --- LVM2.2.02.105/tools/Makefile.in.orig	2014-01-26 18:33:51.531497416 +0100
 +++ LVM2.2.02.105/tools/Makefile.in	2014-01-26 19:14:42.264728615 +0100
-@@ -127,19 +127,19 @@
- CFLAGS_dmsetup.o += $(EXTRA_EXEC_CFLAGS)
+@@ -127,20 +127,20 @@
+ CFLAGS_dmsetup.o += $(UDEV_CFLAGS) $(EXTRA_EXEC_CFLAGS)
  
  dmsetup: dmsetup.o $(top_builddir)/libdm/libdevmapper.$(LIB_SUFFIX)
 -	$(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) -L$(top_builddir)/libdm \
@@ -145,6 +145,7 @@
  all: device-mapper
  
  CFLAGS_lvm.o += $(EXTRA_EXEC_CFLAGS)
+ CFLAGS_lvmcmdline.o += $(VALGRIND_CFLAGS)
  
  lvm: $(OBJECTS) lvm.o $(top_builddir)/lib/liblvm-internal.a
 -	$(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) -o $@ $(OBJECTS) lvm.o \
-- 
2.46.0