Skip to content

Commit

Permalink
fix patch for -p1
Browse files Browse the repository at this point in the history
  • Loading branch information
osresearch committed Apr 12, 2017
1 parent bf95aa1 commit 4310b59
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions patches/lvm2-2.02.168.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
diff -u --recursive ../clean/LVM2.2.02.168/lib/mm/memlock.c ./LVM2.2.02.168/lib/mm/memlock.c
diff -u --recursive ../clean/LVM2.2.02.168/lib/mm/memlock.c LVM2.2.02.168/lib/mm/memlock.c
--- ../clean/LVM2.2.02.168/lib/mm/memlock.c 2016-11-30 18:17:29.000000000 -0500
+++ ./LVM2.2.02.168/lib/mm/memlock.c 2017-04-12 08:18:18.533783802 -0400
+++ LVM2.2.02.168/lib/mm/memlock.c 2017-04-12 08:18:18.533783802 -0400
@@ -150,6 +150,7 @@

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

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

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

device-mapper: all

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

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

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

0 comments on commit 4310b59

Please sign in to comment.