Skip to content

Commit 4310b59

Browse files
committed
fix patch for -p1
1 parent bf95aa1 commit 4310b59

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

patches/lvm2-2.02.168.patch

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
diff -u --recursive ../clean/LVM2.2.02.168/lib/mm/memlock.c ./LVM2.2.02.168/lib/mm/memlock.c
1+
diff -u --recursive ../clean/LVM2.2.02.168/lib/mm/memlock.c LVM2.2.02.168/lib/mm/memlock.c
22
--- ../clean/LVM2.2.02.168/lib/mm/memlock.c 2016-11-30 18:17:29.000000000 -0500
3-
+++ ./LVM2.2.02.168/lib/mm/memlock.c 2017-04-12 08:18:18.533783802 -0400
3+
+++ LVM2.2.02.168/lib/mm/memlock.c 2017-04-12 08:18:18.533783802 -0400
44
@@ -150,6 +150,7 @@
55

66
static void _allocate_memory(void)
@@ -26,9 +26,9 @@ diff -u --recursive ../clean/LVM2.2.02.168/lib/mm/memlock.c ./LVM2.2.02.168/lib/
2626
return 0;
2727
}
2828
} else {
29-
diff -u --recursive ../clean/LVM2.2.02.168/libdm/libdm-stats.c ./LVM2.2.02.168/libdm/libdm-stats.c
29+
diff -u --recursive ../clean/LVM2.2.02.168/libdm/libdm-stats.c LVM2.2.02.168/libdm/libdm-stats.c
3030
--- ../clean/LVM2.2.02.168/libdm/libdm-stats.c 2016-11-30 18:17:30.000000000 -0500
31-
+++ ./LVM2.2.02.168/libdm/libdm-stats.c 2017-04-10 16:50:01.622529656 -0400
31+
+++ LVM2.2.02.168/libdm/libdm-stats.c 2017-04-10 16:50:01.622529656 -0400
3232
@@ -17,7 +17,24 @@
3333

3434
#include "dmlib.h"
@@ -90,9 +90,9 @@ diff -u --recursive ../clean/LVM2.2.02.168/libdm/libdm-stats.c ./LVM2.2.02.168/l
9090
buflen += id_len + 1; /* range end plus "-" */
9191
}
9292
buflen++;
93-
diff -u --recursive ../clean/LVM2.2.02.168/libdm/Makefile.in ./LVM2.2.02.168/libdm/Makefile.in
93+
diff -u --recursive ../clean/LVM2.2.02.168/libdm/Makefile.in LVM2.2.02.168/libdm/Makefile.in
9494
--- ../clean/LVM2.2.02.168/libdm/Makefile.in 2016-11-30 18:17:30.000000000 -0500
95-
+++ ./LVM2.2.02.168/libdm/Makefile.in 2017-04-10 16:50:01.622529656 -0400
95+
+++ LVM2.2.02.168/libdm/Makefile.in 2017-04-10 16:50:01.622529656 -0400
9696
@@ -56,7 +56,8 @@
9797

9898
CFLAGS += $(UDEV_CFLAGS) $(VALGRIND_CFLAGS)
@@ -103,9 +103,9 @@ diff -u --recursive ../clean/LVM2.2.02.168/libdm/Makefile.in ./LVM2.2.02.168/lib
103103

104104
device-mapper: all
105105

106-
diff -u --recursive ../clean/LVM2.2.02.168/make.tmpl.in ./LVM2.2.02.168/make.tmpl.in
106+
diff -u --recursive ../clean/LVM2.2.02.168/make.tmpl.in LVM2.2.02.168/make.tmpl.in
107107
--- ../clean/LVM2.2.02.168/make.tmpl.in 2016-11-30 18:17:30.000000000 -0500
108-
+++ ./LVM2.2.02.168/make.tmpl.in 2017-04-10 16:50:01.626529699 -0400
108+
+++ LVM2.2.02.168/make.tmpl.in 2017-04-10 16:50:01.626529699 -0400
109109
@@ -142,7 +142,7 @@
110110
M_INSTALL_PROGRAM = -m 555
111111
M_INSTALL_DATA = -m 444
@@ -126,9 +126,9 @@ diff -u --recursive ../clean/LVM2.2.02.168/make.tmpl.in ./LVM2.2.02.168/make.tmp
126126

127127
LVM_VERSION := $(shell cat $(top_srcdir)/VERSION)
128128

129-
diff -u --recursive ../clean/LVM2.2.02.168/tools/lvmcmdline.c ./LVM2.2.02.168/tools/lvmcmdline.c
129+
diff -u --recursive ../clean/LVM2.2.02.168/tools/lvmcmdline.c LVM2.2.02.168/tools/lvmcmdline.c
130130
--- ../clean/LVM2.2.02.168/tools/lvmcmdline.c 2016-11-30 18:17:32.000000000 -0500
131-
+++ ./LVM2.2.02.168/tools/lvmcmdline.c 2017-04-10 16:50:01.626529699 -0400
131+
+++ LVM2.2.02.168/tools/lvmcmdline.c 2017-04-10 16:50:01.626529699 -0400
132132
@@ -1817,6 +1817,7 @@
133133
{
134134
int err = is_valid_fd(STDERR_FILENO);

0 commit comments

Comments
 (0)