diff options
4 files changed, 13 insertions, 13 deletions
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 c14c64ced6..087a0501e0 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 | |||
@@ -1,4 +1,4 @@ | |||
1 | From 7c3b869e77da17a89df69671cdf069a59a93d6e4 Mon Sep 17 00:00:00 2001 | 1 | From cfa37411fa2ebe8ade94742ee00f86d0e386a651 Mon Sep 17 00:00:00 2001 |
2 | From: Dengke Du <dengke.du@windriver.com> | 2 | From: Dengke Du <dengke.du@windriver.com> |
3 | Date: Tue, 25 Oct 2016 11:49:40 +0000 | 3 | Date: Tue, 25 Oct 2016 11:49:40 +0000 |
4 | Subject: [PATCH] implement libc specific reopen_stream | 4 | Subject: [PATCH] implement libc specific reopen_stream |
@@ -45,10 +45,10 @@ index 90905e629..ed69662d0 100644 | |||
45 | void init_log_fn(lvm2_log_fn_t log_fn) | 45 | void init_log_fn(lvm2_log_fn_t log_fn) |
46 | { | 46 | { |
47 | diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c | 47 | diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c |
48 | index be50473c8..aec6487b6 100644 | 48 | index 4af6adc83..fbab70988 100644 |
49 | --- a/tools/lvmcmdline.c | 49 | --- a/tools/lvmcmdline.c |
50 | +++ b/tools/lvmcmdline.c | 50 | +++ b/tools/lvmcmdline.c |
51 | @@ -3393,7 +3393,7 @@ static int _check_standard_fds(void) | 51 | @@ -3395,7 +3395,7 @@ static int _check_standard_fds(void) |
52 | int err = is_valid_fd(STDERR_FILENO); | 52 | int err = is_valid_fd(STDERR_FILENO); |
53 | 53 | ||
54 | if (!is_valid_fd(STDIN_FILENO) && | 54 | if (!is_valid_fd(STDIN_FILENO) && |
@@ -57,7 +57,7 @@ index be50473c8..aec6487b6 100644 | |||
57 | if (err) | 57 | if (err) |
58 | perror("stdin stream open"); | 58 | perror("stdin stream open"); |
59 | else | 59 | else |
60 | @@ -3403,7 +3403,7 @@ static int _check_standard_fds(void) | 60 | @@ -3405,7 +3405,7 @@ static int _check_standard_fds(void) |
61 | } | 61 | } |
62 | 62 | ||
63 | if (!is_valid_fd(STDOUT_FILENO) && | 63 | if (!is_valid_fd(STDOUT_FILENO) && |
@@ -66,7 +66,7 @@ index be50473c8..aec6487b6 100644 | |||
66 | if (err) | 66 | if (err) |
67 | perror("stdout stream open"); | 67 | perror("stdout stream open"); |
68 | /* else no stdout */ | 68 | /* else no stdout */ |
69 | @@ -3411,7 +3411,7 @@ static int _check_standard_fds(void) | 69 | @@ -3413,7 +3413,7 @@ static int _check_standard_fds(void) |
70 | } | 70 | } |
71 | 71 | ||
72 | if (!is_valid_fd(STDERR_FILENO) && | 72 | if (!is_valid_fd(STDERR_FILENO) && |
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 a8e1dfcb3f..ac5c440e4e 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 | |||
@@ -1,4 +1,4 @@ | |||
1 | From a52b50cf47e4b7fc2a1a27d6e35a26d03e2abed6 Mon Sep 17 00:00:00 2001 | 1 | From 53a879b5a285722f0cb0ee42607c1cd1102b79be Mon Sep 17 00:00:00 2001 |
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
3 | Date: Tue, 31 Jul 2018 15:04:29 +0800 | 3 | Date: Tue, 31 Jul 2018 15:04:29 +0800 |
4 | Subject: [PATCH] tweak MODPROBE_CMD for cross compile | 4 | Subject: [PATCH] tweak MODPROBE_CMD for cross compile |
@@ -21,10 +21,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | |||
21 | 1 file changed, 2 deletions(-) | 21 | 1 file changed, 2 deletions(-) |
22 | 22 | ||
23 | diff --git a/configure.ac b/configure.ac | 23 | diff --git a/configure.ac b/configure.ac |
24 | index 3604fca06..167587d09 100644 | 24 | index e5e5e71ce..3af73c781 100644 |
25 | --- a/configure.ac | 25 | --- a/configure.ac |
26 | +++ b/configure.ac | 26 | +++ b/configure.ac |
27 | @@ -1707,8 +1707,6 @@ AS_IF([test "$BUILD_DMFILEMAPD" = "yes"], [ | 27 | @@ -1742,8 +1742,6 @@ AS_IF([test "$BUILD_DMFILEMAPD" = "yes"], [ |
28 | ]) | 28 | ]) |
29 | 29 | ||
30 | ################################################################################ | 30 | ################################################################################ |
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 862cda8ed6..f7a85b4b3f 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 | |||
@@ -1,4 +1,4 @@ | |||
1 | From 0c02c24208afec03aa34839cb3e102fb1c15a9c9 Mon Sep 17 00:00:00 2001 | 1 | From 8657541b91b4f2bd05ce14ec9899ff5f9f3b7d4c Mon Sep 17 00:00:00 2001 |
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
3 | Date: Mon, 26 Nov 2018 14:59:55 +0800 | 3 | Date: Mon, 26 Nov 2018 14:59:55 +0800 |
4 | Subject: [PATCH] do not build manual | 4 | Subject: [PATCH] do not build manual |
@@ -57,10 +57,10 @@ index 06c4b1823..90df7b09c 100644 | |||
57 | 57 | ||
58 | ifeq ("@INTL@", "yes") | 58 | ifeq ("@INTL@", "yes") |
59 | diff --git a/configure.ac b/configure.ac | 59 | diff --git a/configure.ac b/configure.ac |
60 | index 167587d09..557738497 100644 | 60 | index 3af73c781..f32d1f376 100644 |
61 | --- a/configure.ac | 61 | --- a/configure.ac |
62 | +++ b/configure.ac | 62 | +++ b/configure.ac |
63 | @@ -2041,7 +2041,6 @@ libdaemon/server/Makefile | 63 | @@ -2076,7 +2076,6 @@ libdaemon/server/Makefile |
64 | libdm/Makefile | 64 | libdm/Makefile |
65 | libdm/dm-tools/Makefile | 65 | libdm/dm-tools/Makefile |
66 | libdm/libdevmapper.pc | 66 | libdm/libdevmapper.pc |
diff --git a/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-oe/recipes-support/lvm2/lvm2.inc index 030ce938cc..1f608c29d0 100644 --- a/meta-oe/recipes-support/lvm2/lvm2.inc +++ b/meta-oe/recipes-support/lvm2/lvm2.inc | |||
@@ -18,9 +18,9 @@ SRC_URI = "git://sourceware.org/git/lvm2.git;branch=main \ | |||
18 | file://0001-include-libgen.h-for-basename.patch \ | 18 | file://0001-include-libgen.h-for-basename.patch \ |
19 | " | 19 | " |
20 | 20 | ||
21 | SRCREV = "32cfcfd151d49c4e1876a455072c593ad11eaccf" | 21 | SRCREV = "9f81fccd65a29030bf70417e8aca659ae536e081" |
22 | S = "${WORKDIR}/git" | 22 | S = "${WORKDIR}/git" |
23 | PV = "2.03.29" | 23 | PV = "2.03.30" |
24 | 24 | ||
25 | UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\_\d+)+)" | 25 | UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\_\d+)+)" |
26 | 26 | ||