diff options
author | Armin Kuster <akuster808@gmail.com> | 2018-05-20 14:24:15 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2018-05-26 21:10:55 -0700 |
commit | 40c0b16b72416736bd5e83ce04733d7260192f59 (patch) | |
tree | 569a600dff56a8bf8502712f082cd63ba6353f73 /meta-oe | |
parent | acfc380d4e700d3cb0d355d3e8e9afdba181d050 (diff) | |
download | meta-openembedded-40c0b16b72416736bd5e83ce04733d7260192f59.tar.gz |
lvm2: refresh patches
used quilt to refresh
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe')
5 files changed, 73 insertions, 88 deletions
diff --git a/meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch b/meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch index e86ab25e6..5b55111dc 100644 --- a/meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch +++ b/meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch | |||
@@ -17,17 +17,17 @@ Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> | |||
17 | scripts/lvm2_monitoring_init_rhel4 | 4 ++-- | 17 | scripts/lvm2_monitoring_init_rhel4 | 4 ++-- |
18 | 8 files changed, 17 insertions(+), 17 deletions(-) | 18 | 8 files changed, 17 insertions(+), 17 deletions(-) |
19 | 19 | ||
20 | diff --git a/scripts/blk_availability_init_red_hat.in b/scripts/blk_availability_init_red_hat.in | 20 | Index: LVM2.2.02.177/scripts/blk_availability_init_red_hat.in |
21 | index a84ffe7..6b855b7 100644 | 21 | =================================================================== |
22 | --- a/scripts/blk_availability_init_red_hat.in | 22 | --- LVM2.2.02.177.orig/scripts/blk_availability_init_red_hat.in |
23 | +++ b/scripts/blk_availability_init_red_hat.in | 23 | +++ LVM2.2.02.177/scripts/blk_availability_init_red_hat.in |
24 | @@ -1,4 +1,4 @@ | 24 | @@ -1,4 +1,4 @@ |
25 | -#!/bin/bash | 25 | -#!/bin/bash |
26 | +#!/bin/sh | 26 | +#!/bin/sh |
27 | # | 27 | # |
28 | # Copyright (C) 2012 Red Hat, Inc. All rights reserved. | 28 | # Copyright (C) 2012-2017 Red Hat, Inc. All rights reserved. |
29 | # | 29 | # |
30 | @@ -53,6 +53,6 @@ case "$1" in | 30 | @@ -51,6 +51,6 @@ case "$1" in |
31 | status) | 31 | status) |
32 | ;; | 32 | ;; |
33 | *) | 33 | *) |
@@ -35,10 +35,10 @@ index a84ffe7..6b855b7 100644 | |||
35 | + echo "Usage: $0 {start|stop|status}" | 35 | + echo "Usage: $0 {start|stop|status}" |
36 | ;; | 36 | ;; |
37 | esac | 37 | esac |
38 | diff --git a/scripts/clvmd_init_red_hat.in b/scripts/clvmd_init_red_hat.in | 38 | Index: LVM2.2.02.177/scripts/clvmd_init_red_hat.in |
39 | index d7f3392..abc8011 100644 | 39 | =================================================================== |
40 | --- a/scripts/clvmd_init_red_hat.in | 40 | --- LVM2.2.02.177.orig/scripts/clvmd_init_red_hat.in |
41 | +++ b/scripts/clvmd_init_red_hat.in | 41 | +++ LVM2.2.02.177/scripts/clvmd_init_red_hat.in |
42 | @@ -1,4 +1,4 @@ | 42 | @@ -1,4 +1,4 @@ |
43 | -#!/bin/bash | 43 | -#!/bin/bash |
44 | +#!/bin/sh | 44 | +#!/bin/sh |
@@ -63,17 +63,17 @@ index d7f3392..abc8011 100644 | |||
63 | rtrn=2 | 63 | rtrn=2 |
64 | ;; | 64 | ;; |
65 | esac | 65 | esac |
66 | diff --git a/scripts/cmirrord_init_red_hat.in b/scripts/cmirrord_init_red_hat.in | 66 | Index: LVM2.2.02.177/scripts/cmirrord_init_red_hat.in |
67 | index d4b7e37..d442cbc 100755 | 67 | =================================================================== |
68 | --- a/scripts/cmirrord_init_red_hat.in | 68 | --- LVM2.2.02.177.orig/scripts/cmirrord_init_red_hat.in |
69 | +++ b/scripts/cmirrord_init_red_hat.in | 69 | +++ LVM2.2.02.177/scripts/cmirrord_init_red_hat.in |
70 | @@ -1,4 +1,4 @@ | 70 | @@ -1,4 +1,4 @@ |
71 | -#!/bin/bash | 71 | -#!/bin/bash |
72 | +#!/bin/sh | 72 | +#!/bin/sh |
73 | # | 73 | # |
74 | # chkconfig: - 22 78 | 74 | # chkconfig: - 22 78 |
75 | # description: Starts and stops cmirrord | 75 | # description: Starts and stops cmirrord |
76 | @@ -101,7 +101,7 @@ case "$1" in | 76 | @@ -103,7 +103,7 @@ case "$1" in |
77 | ;; | 77 | ;; |
78 | 78 | ||
79 | *) | 79 | *) |
@@ -82,15 +82,15 @@ index d4b7e37..d442cbc 100755 | |||
82 | ;; | 82 | ;; |
83 | esac | 83 | esac |
84 | 84 | ||
85 | diff --git a/scripts/lvm2_cluster_activation_red_hat.sh.in b/scripts/lvm2_cluster_activation_red_hat.sh.in | 85 | Index: LVM2.2.02.177/scripts/lvm2_cluster_activation_red_hat.sh.in |
86 | index abea026..d8cba2e 100644 | 86 | =================================================================== |
87 | --- a/scripts/lvm2_cluster_activation_red_hat.sh.in | 87 | --- LVM2.2.02.177.orig/scripts/lvm2_cluster_activation_red_hat.sh.in |
88 | +++ b/scripts/lvm2_cluster_activation_red_hat.sh.in | 88 | +++ LVM2.2.02.177/scripts/lvm2_cluster_activation_red_hat.sh.in |
89 | @@ -1,4 +1,4 @@ | 89 | @@ -1,4 +1,4 @@ |
90 | -#!/bin/bash | 90 | -#!/bin/bash |
91 | +#!/bin/sh | 91 | +#!/bin/sh |
92 | 92 | ||
93 | sbindir=@sbindir@ | 93 | sbindir="@SBINDIR@" |
94 | 94 | ||
95 | @@ -54,7 +54,7 @@ case "$1" in | 95 | @@ -54,7 +54,7 @@ case "$1" in |
96 | rtrn=$? | 96 | rtrn=$? |
@@ -101,17 +101,17 @@ index abea026..d8cba2e 100644 | |||
101 | rtrn=3 | 101 | rtrn=3 |
102 | ;; | 102 | ;; |
103 | esac | 103 | esac |
104 | diff --git a/scripts/lvm2_lvmetad_init_red_hat.in b/scripts/lvm2_lvmetad_init_red_hat.in | 104 | Index: LVM2.2.02.177/scripts/lvm2_lvmetad_init_red_hat.in |
105 | index b2f5d50..96269a9 100644 | 105 | =================================================================== |
106 | --- a/scripts/lvm2_lvmetad_init_red_hat.in | 106 | --- LVM2.2.02.177.orig/scripts/lvm2_lvmetad_init_red_hat.in |
107 | +++ b/scripts/lvm2_lvmetad_init_red_hat.in | 107 | +++ LVM2.2.02.177/scripts/lvm2_lvmetad_init_red_hat.in |
108 | @@ -1,4 +1,4 @@ | 108 | @@ -1,4 +1,4 @@ |
109 | -#!/bin/bash | 109 | -#!/bin/bash |
110 | +#!/bin/sh | 110 | +#!/bin/sh |
111 | # | 111 | # |
112 | # Copyright (C) 2012 Red Hat, Inc. All rights reserved. | 112 | # Copyright (C) 2012-2017 Red Hat, Inc. All rights reserved. |
113 | # | 113 | # |
114 | @@ -105,7 +105,7 @@ case "$1" in | 114 | @@ -103,7 +103,7 @@ case "$1" in |
115 | ;; | 115 | ;; |
116 | 116 | ||
117 | *) | 117 | *) |
@@ -120,17 +120,17 @@ index b2f5d50..96269a9 100644 | |||
120 | ;; | 120 | ;; |
121 | esac | 121 | esac |
122 | 122 | ||
123 | diff --git a/scripts/lvm2_lvmpolld_init_red_hat.in b/scripts/lvm2_lvmpolld_init_red_hat.in | 123 | Index: LVM2.2.02.177/scripts/lvm2_lvmpolld_init_red_hat.in |
124 | index c521955..cdbaece 100644 | 124 | =================================================================== |
125 | --- a/scripts/lvm2_lvmpolld_init_red_hat.in | 125 | --- LVM2.2.02.177.orig/scripts/lvm2_lvmpolld_init_red_hat.in |
126 | +++ b/scripts/lvm2_lvmpolld_init_red_hat.in | 126 | +++ LVM2.2.02.177/scripts/lvm2_lvmpolld_init_red_hat.in |
127 | @@ -1,4 +1,4 @@ | 127 | @@ -1,4 +1,4 @@ |
128 | -#!/bin/bash | 128 | -#!/bin/bash |
129 | +#!/bin/sh | 129 | +#!/bin/sh |
130 | # | 130 | # |
131 | # Copyright (C) 2015 Red Hat, Inc. All rights reserved. | 131 | # Copyright (C) 2015 Red Hat, Inc. All rights reserved. |
132 | # | 132 | # |
133 | @@ -107,7 +107,7 @@ case "$1" in | 133 | @@ -105,7 +105,7 @@ case "$1" in |
134 | ;; | 134 | ;; |
135 | 135 | ||
136 | *) | 136 | *) |
@@ -139,17 +139,17 @@ index c521955..cdbaece 100644 | |||
139 | ;; | 139 | ;; |
140 | esac | 140 | esac |
141 | 141 | ||
142 | diff --git a/scripts/lvm2_monitoring_init_red_hat.in b/scripts/lvm2_monitoring_init_red_hat.in | 142 | Index: LVM2.2.02.177/scripts/lvm2_monitoring_init_red_hat.in |
143 | index de7ff0d..9ff6bb7 100644 | 143 | =================================================================== |
144 | --- a/scripts/lvm2_monitoring_init_red_hat.in | 144 | --- LVM2.2.02.177.orig/scripts/lvm2_monitoring_init_red_hat.in |
145 | +++ b/scripts/lvm2_monitoring_init_red_hat.in | 145 | +++ LVM2.2.02.177/scripts/lvm2_monitoring_init_red_hat.in |
146 | @@ -1,4 +1,4 @@ | 146 | @@ -1,4 +1,4 @@ |
147 | -#!/bin/bash | 147 | -#!/bin/bash |
148 | +#!/bin/sh | 148 | +#!/bin/sh |
149 | # | 149 | # |
150 | # Copyright (C) 2007-2009 Red Hat, Inc. All rights reserved. | 150 | # Copyright (C) 2007-2009 Red Hat, Inc. All rights reserved. |
151 | # | 151 | # |
152 | @@ -128,7 +128,7 @@ case "$1" in | 152 | @@ -127,7 +127,7 @@ case "$1" in |
153 | ;; | 153 | ;; |
154 | 154 | ||
155 | *) | 155 | *) |
@@ -158,10 +158,10 @@ index de7ff0d..9ff6bb7 100644 | |||
158 | ;; | 158 | ;; |
159 | esac | 159 | esac |
160 | 160 | ||
161 | diff --git a/scripts/lvm2_monitoring_init_rhel4 b/scripts/lvm2_monitoring_init_rhel4 | 161 | Index: LVM2.2.02.177/scripts/lvm2_monitoring_init_rhel4 |
162 | index 8eb06c5..2e8d0f7 100644 | 162 | =================================================================== |
163 | --- a/scripts/lvm2_monitoring_init_rhel4 | 163 | --- LVM2.2.02.177.orig/scripts/lvm2_monitoring_init_rhel4 |
164 | +++ b/scripts/lvm2_monitoring_init_rhel4 | 164 | +++ LVM2.2.02.177/scripts/lvm2_monitoring_init_rhel4 |
165 | @@ -1,4 +1,4 @@ | 165 | @@ -1,4 +1,4 @@ |
166 | -#!/bin/bash | 166 | -#!/bin/bash |
167 | +#!/bin/sh | 167 | +#!/bin/sh |
@@ -177,6 +177,3 @@ index 8eb06c5..2e8d0f7 100644 | |||
177 | ;; | 177 | ;; |
178 | esac | 178 | esac |
179 | 179 | ||
180 | -- | ||
181 | 2.12.0 | ||
182 | |||
diff --git a/meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch b/meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch index 5d72402bd..bb582ed1f 100644 --- a/meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch +++ b/meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch | |||
@@ -19,11 +19,11 @@ Signed-off-by: Dengke Du <dengke.du@windriver.com> | |||
19 | tools/lvmcmdline.c | 6 +++--- | 19 | tools/lvmcmdline.c | 6 +++--- |
20 | 2 files changed, 9 insertions(+), 3 deletions(-) | 20 | 2 files changed, 9 insertions(+), 3 deletions(-) |
21 | 21 | ||
22 | diff --git a/lib/log/log.c b/lib/log/log.c | 22 | Index: LVM2.2.02.177/lib/log/log.c |
23 | index c933154..3581084 100644 | 23 | =================================================================== |
24 | --- a/lib/log/log.c | 24 | --- LVM2.2.02.177.orig/lib/log/log.c |
25 | +++ b/lib/log/log.c | 25 | +++ LVM2.2.02.177/lib/log/log.c |
26 | @@ -161,6 +161,7 @@ static void _check_and_replace_standard_log_streams(FILE *old_stream, FILE *new_ | 26 | @@ -161,6 +161,7 @@ static void _check_and_replace_standard_ |
27 | * Close and reopen standard stream on file descriptor fd. | 27 | * Close and reopen standard stream on file descriptor fd. |
28 | */ | 28 | */ |
29 | int reopen_standard_stream(FILE **stream, const char *mode) | 29 | int reopen_standard_stream(FILE **stream, const char *mode) |
@@ -31,7 +31,7 @@ index c933154..3581084 100644 | |||
31 | { | 31 | { |
32 | int fd, fd_copy, new_fd; | 32 | int fd, fd_copy, new_fd; |
33 | const char *name; | 33 | const char *name; |
34 | @@ -207,6 +208,11 @@ int reopen_standard_stream(FILE **stream, const char *mode) | 34 | @@ -207,6 +208,11 @@ int reopen_standard_stream(FILE **stream |
35 | *stream = new_stream; | 35 | *stream = new_stream; |
36 | return 1; | 36 | return 1; |
37 | } | 37 | } |
@@ -43,11 +43,11 @@ index c933154..3581084 100644 | |||
43 | 43 | ||
44 | void init_log_fn(lvm2_log_fn_t log_fn) | 44 | void init_log_fn(lvm2_log_fn_t log_fn) |
45 | { | 45 | { |
46 | diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c | 46 | Index: LVM2.2.02.177/tools/lvmcmdline.c |
47 | index 9a4deb7..f1f18e6 100644 | 47 | =================================================================== |
48 | --- a/tools/lvmcmdline.c | 48 | --- LVM2.2.02.177.orig/tools/lvmcmdline.c |
49 | +++ b/tools/lvmcmdline.c | 49 | +++ LVM2.2.02.177/tools/lvmcmdline.c |
50 | @@ -1818,7 +1818,7 @@ static int _check_standard_fds(void) | 50 | @@ -3095,7 +3095,7 @@ static int _check_standard_fds(void) |
51 | int err = is_valid_fd(STDERR_FILENO); | 51 | int err = is_valid_fd(STDERR_FILENO); |
52 | 52 | ||
53 | if (!is_valid_fd(STDIN_FILENO) && | 53 | if (!is_valid_fd(STDIN_FILENO) && |
@@ -56,7 +56,7 @@ index 9a4deb7..f1f18e6 100644 | |||
56 | if (err) | 56 | if (err) |
57 | perror("stdin stream open"); | 57 | perror("stdin stream open"); |
58 | else | 58 | else |
59 | @@ -1828,7 +1828,7 @@ static int _check_standard_fds(void) | 59 | @@ -3105,7 +3105,7 @@ static int _check_standard_fds(void) |
60 | } | 60 | } |
61 | 61 | ||
62 | if (!is_valid_fd(STDOUT_FILENO) && | 62 | if (!is_valid_fd(STDOUT_FILENO) && |
@@ -65,7 +65,7 @@ index 9a4deb7..f1f18e6 100644 | |||
65 | if (err) | 65 | if (err) |
66 | perror("stdout stream open"); | 66 | perror("stdout stream open"); |
67 | /* else no stdout */ | 67 | /* else no stdout */ |
68 | @@ -1836,7 +1836,7 @@ static int _check_standard_fds(void) | 68 | @@ -3113,7 +3113,7 @@ static int _check_standard_fds(void) |
69 | } | 69 | } |
70 | 70 | ||
71 | if (!is_valid_fd(STDERR_FILENO) && | 71 | if (!is_valid_fd(STDERR_FILENO) && |
@@ -74,6 +74,3 @@ index 9a4deb7..f1f18e6 100644 | |||
74 | printf("stderr stream open: %s\n", | 74 | printf("stderr stream open: %s\n", |
75 | strerror(errno)); | 75 | strerror(errno)); |
76 | return 0; | 76 | return 0; |
77 | -- | ||
78 | 2.12.0 | ||
79 | |||
diff --git a/meta-oe/recipes-support/lvm2/files/0002-Guard-use-of-mallinfo-with-__GLIBC__.patch b/meta-oe/recipes-support/lvm2/files/0002-Guard-use-of-mallinfo-with-__GLIBC__.patch index 95dcede33..ce8a97ab6 100644 --- a/meta-oe/recipes-support/lvm2/files/0002-Guard-use-of-mallinfo-with-__GLIBC__.patch +++ b/meta-oe/recipes-support/lvm2/files/0002-Guard-use-of-mallinfo-with-__GLIBC__.patch | |||
@@ -12,11 +12,11 @@ Signed-off-by: Dengke Du <dengke.du@windriver.com> | |||
12 | lib/mm/memlock.c | 2 +- | 12 | lib/mm/memlock.c | 2 +- |
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | 13 | 1 file changed, 1 insertion(+), 1 deletion(-) |
14 | 14 | ||
15 | diff --git a/lib/mm/memlock.c b/lib/mm/memlock.c | 15 | Index: LVM2.2.02.177/lib/mm/memlock.c |
16 | index da90144..f34f890 100644 | 16 | =================================================================== |
17 | --- a/lib/mm/memlock.c | 17 | --- LVM2.2.02.177.orig/lib/mm/memlock.c |
18 | +++ b/lib/mm/memlock.c | 18 | +++ LVM2.2.02.177/lib/mm/memlock.c |
19 | @@ -150,7 +150,7 @@ static void _touch_memory(void *mem, size_t size) | 19 | @@ -151,7 +151,7 @@ static void _touch_memory(void *mem, siz |
20 | 20 | ||
21 | static void _allocate_memory(void) | 21 | static void _allocate_memory(void) |
22 | { | 22 | { |
@@ -25,6 +25,3 @@ index da90144..f34f890 100644 | |||
25 | void *stack_mem; | 25 | void *stack_mem; |
26 | struct rlimit limit; | 26 | struct rlimit limit; |
27 | int i, area = 0, missing = _size_malloc_tmp, max_areas = 32, hblks; | 27 | int i, area = 0, missing = _size_malloc_tmp, max_areas = 32, hblks; |
28 | -- | ||
29 | 2.12.0 | ||
30 | |||
diff --git a/meta-oe/recipes-support/lvm2/files/0004-tweak-MODPROBE_CMD-for-cross-compile.patch b/meta-oe/recipes-support/lvm2/files/0004-tweak-MODPROBE_CMD-for-cross-compile.patch index aaeaa725d..425ba7406 100644 --- a/meta-oe/recipes-support/lvm2/files/0004-tweak-MODPROBE_CMD-for-cross-compile.patch +++ b/meta-oe/recipes-support/lvm2/files/0004-tweak-MODPROBE_CMD-for-cross-compile.patch | |||
@@ -21,11 +21,11 @@ Signed-off-by: Dengke Du <dengke.du@windriver.com> | |||
21 | configure.in | 1 - | 21 | configure.in | 1 - |
22 | 1 file changed, 1 deletion(-) | 22 | 1 file changed, 1 deletion(-) |
23 | 23 | ||
24 | diff --git a/configure.in b/configure.in | 24 | Index: LVM2.2.02.177/configure.in |
25 | index cc77aab..a3579f2 100644 | 25 | =================================================================== |
26 | --- a/configure.in | 26 | --- LVM2.2.02.177.orig/configure.in |
27 | +++ b/configure.in | 27 | +++ LVM2.2.02.177/configure.in |
28 | @@ -1853,7 +1853,6 @@ if test "$UDEV_SYNC" = yes; then | 28 | @@ -1870,7 +1870,6 @@ if test "$BUILD_DMFILEMAPD" = yes; then |
29 | fi | 29 | fi |
30 | 30 | ||
31 | ################################################################################ | 31 | ################################################################################ |
@@ -33,6 +33,3 @@ index cc77aab..a3579f2 100644 | |||
33 | 33 | ||
34 | if test -n "$MODPROBE_CMD"; then | 34 | if test -n "$MODPROBE_CMD"; then |
35 | AC_DEFINE_UNQUOTED([MODPROBE_CMD], ["$MODPROBE_CMD"], [The path to 'modprobe', if available.]) | 35 | AC_DEFINE_UNQUOTED([MODPROBE_CMD], ["$MODPROBE_CMD"], [The path to 'modprobe', if available.]) |
36 | -- | ||
37 | 2.9.3 | ||
38 | |||
diff --git a/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch b/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch index 15aa9f500..01477e0c9 100644 --- a/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch +++ b/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch | |||
@@ -19,10 +19,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | |||
19 | configure.in | 1 - | 19 | configure.in | 1 - |
20 | 2 files changed, 2 insertions(+), 3 deletions(-) | 20 | 2 files changed, 2 insertions(+), 3 deletions(-) |
21 | 21 | ||
22 | diff --git a/Makefile.in b/Makefile.in | 22 | Index: LVM2.2.02.177/Makefile.in |
23 | index 31d428d..24f89a2 100644 | 23 | =================================================================== |
24 | --- a/Makefile.in | 24 | --- LVM2.2.02.177.orig/Makefile.in |
25 | +++ b/Makefile.in | 25 | +++ LVM2.2.02.177/Makefile.in |
26 | @@ -18,7 +18,7 @@ top_builddir = @top_builddir@ | 26 | @@ -18,7 +18,7 @@ top_builddir = @top_builddir@ |
27 | abs_top_builddir = @abs_top_builddir@ | 27 | abs_top_builddir = @abs_top_builddir@ |
28 | abs_top_srcdir = @abs_top_srcdir@ | 28 | abs_top_srcdir = @abs_top_srcdir@ |
@@ -32,7 +32,7 @@ index 31d428d..24f89a2 100644 | |||
32 | 32 | ||
33 | ifeq ("@UDEV_RULES@", "yes") | 33 | ifeq ("@UDEV_RULES@", "yes") |
34 | SUBDIRS += udev | 34 | SUBDIRS += udev |
35 | @@ -69,7 +69,7 @@ liblvm.device-mapper: include.device-mapper | 35 | @@ -69,7 +69,7 @@ liblvm.device-mapper: include.device-map |
36 | daemons.device-mapper: libdm.device-mapper | 36 | daemons.device-mapper: libdm.device-mapper |
37 | tools.device-mapper: libdm.device-mapper | 37 | tools.device-mapper: libdm.device-mapper |
38 | scripts.device-mapper: include.device-mapper | 38 | scripts.device-mapper: include.device-mapper |
@@ -41,11 +41,11 @@ index 31d428d..24f89a2 100644 | |||
41 | 41 | ||
42 | ifeq ("@INTL@", "yes") | 42 | ifeq ("@INTL@", "yes") |
43 | lib.pofile: include.pofile | 43 | lib.pofile: include.pofile |
44 | diff --git a/configure.in b/configure.in | 44 | Index: LVM2.2.02.177/configure.in |
45 | index 1dc8819..108ace4 100644 | 45 | =================================================================== |
46 | --- a/configure.in | 46 | --- LVM2.2.02.177.orig/configure.in |
47 | +++ b/configure.in | 47 | +++ LVM2.2.02.177/configure.in |
48 | @@ -2213,7 +2213,6 @@ libdm/Makefile | 48 | @@ -2216,7 +2216,6 @@ libdm/Makefile |
49 | libdm/libdevmapper.pc | 49 | libdm/libdevmapper.pc |
50 | liblvm/Makefile | 50 | liblvm/Makefile |
51 | liblvm/liblvm2app.pc | 51 | liblvm/liblvm2app.pc |
@@ -53,6 +53,3 @@ index 1dc8819..108ace4 100644 | |||
53 | po/Makefile | 53 | po/Makefile |
54 | python/Makefile | 54 | python/Makefile |
55 | python/setup.py | 55 | python/setup.py |
56 | -- | ||
57 | 2.8.1 | ||
58 | |||