diff options
| author | Daniel Golle <daniel@makrotopia.org> | 2014-10-19 00:35:17 +0200 |
|---|---|---|
| committer | Daniel Golle <daniel@makrotopia.org> | 2014-10-19 01:01:14 +0200 |
| commit | 1a911c1fe5d663e612b9659a85770dbd7388b24d (patch) | |
| tree | 26a61e4218ac77ea8ceed003911aa89dbc336c71 /utils/lvm2/patches | |
| parent | bfcfcc48c3b3fa939dae4214833a6aac03534138 (diff) | |
lvm2: add from old repo and update
Also add patch to fix blkid header location as suggested in #17877
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Diffstat (limited to 'utils/lvm2/patches')
| -rw-r--r-- | utils/lvm2/patches/000-compile.patch | 11 | ||||
| -rw-r--r-- | utils/lvm2/patches/001-include_fix.patch | 12 |
2 files changed, 23 insertions, 0 deletions
diff --git a/utils/lvm2/patches/000-compile.patch b/utils/lvm2/patches/000-compile.patch new file mode 100644 index 000000000..0c7dfea7f --- /dev/null +++ b/utils/lvm2/patches/000-compile.patch @@ -0,0 +1,11 @@ +--- a/make.tmpl.in ++++ b/make.tmpl.in +@@ -19,7 +19,7 @@ + + # Allow environment to override any built-in default value for CC. + # If there is a built-in default, CC is NOT set to @CC@ here. +-CC ?= @CC@ ++CC = @CC@ + + # If $(CC) holds the usual built-in default value of 'cc' then replace it with + # the configured value. diff --git a/utils/lvm2/patches/001-include_fix.patch b/utils/lvm2/patches/001-include_fix.patch new file mode 100644 index 000000000..0c79d5da1 --- /dev/null +++ b/utils/lvm2/patches/001-include_fix.patch @@ -0,0 +1,12 @@ +diff -urN LVM2.2.02.111.old/lib/device/dev-type.c LVM2.2.02.111/lib/device/dev-type.c +--- LVM2.2.02.111.old/lib/device/dev-type.c 2014-09-17 09:41:08.281821278 -0400 ++++ LVM2.2.02.111/lib/device/dev-type.c 2014-09-17 09:41:50.773821280 -0400 +@@ -22,7 +22,7 @@ + #include <ctype.h> + + #ifdef BLKID_WIPING_SUPPORT +-#include <blkid.h> ++#include <blkid/blkid.h> + #endif + + #include "device-types.h" |