mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-05 02:50:46 +00:00
lvm2: update 2.03.29 -> 2.03.30
0001-implement-libc-specific-reopen_stream.patch 0004-tweak-MODPROBE_CMD-for-cross-compile.patch 0005-do-not-build-manual.patch refreshed for 2.03.30 Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From 7c3b869e77da17a89df69671cdf069a59a93d6e4 Mon Sep 17 00:00:00 2001
|
||||
From cfa37411fa2ebe8ade94742ee00f86d0e386a651 Mon Sep 17 00:00:00 2001
|
||||
From: Dengke Du <dengke.du@windriver.com>
|
||||
Date: Tue, 25 Oct 2016 11:49:40 +0000
|
||||
Subject: [PATCH] implement libc specific reopen_stream
|
||||
@@ -45,10 +45,10 @@ index 90905e629..ed69662d0 100644
|
||||
void init_log_fn(lvm2_log_fn_t log_fn)
|
||||
{
|
||||
diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
|
||||
index be50473c8..aec6487b6 100644
|
||||
index 4af6adc83..fbab70988 100644
|
||||
--- a/tools/lvmcmdline.c
|
||||
+++ b/tools/lvmcmdline.c
|
||||
@@ -3393,7 +3393,7 @@ static int _check_standard_fds(void)
|
||||
@@ -3395,7 +3395,7 @@ static int _check_standard_fds(void)
|
||||
int err = is_valid_fd(STDERR_FILENO);
|
||||
|
||||
if (!is_valid_fd(STDIN_FILENO) &&
|
||||
@@ -57,7 +57,7 @@ index be50473c8..aec6487b6 100644
|
||||
if (err)
|
||||
perror("stdin stream open");
|
||||
else
|
||||
@@ -3403,7 +3403,7 @@ static int _check_standard_fds(void)
|
||||
@@ -3405,7 +3405,7 @@ static int _check_standard_fds(void)
|
||||
}
|
||||
|
||||
if (!is_valid_fd(STDOUT_FILENO) &&
|
||||
@@ -66,7 +66,7 @@ index be50473c8..aec6487b6 100644
|
||||
if (err)
|
||||
perror("stdout stream open");
|
||||
/* else no stdout */
|
||||
@@ -3411,7 +3411,7 @@ static int _check_standard_fds(void)
|
||||
@@ -3413,7 +3413,7 @@ static int _check_standard_fds(void)
|
||||
}
|
||||
|
||||
if (!is_valid_fd(STDERR_FILENO) &&
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From a52b50cf47e4b7fc2a1a27d6e35a26d03e2abed6 Mon Sep 17 00:00:00 2001
|
||||
From 53a879b5a285722f0cb0ee42607c1cd1102b79be Mon Sep 17 00:00:00 2001
|
||||
From: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
Date: Tue, 31 Jul 2018 15:04:29 +0800
|
||||
Subject: [PATCH] tweak MODPROBE_CMD for cross compile
|
||||
@@ -21,10 +21,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
1 file changed, 2 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 3604fca06..167587d09 100644
|
||||
index e5e5e71ce..3af73c781 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -1707,8 +1707,6 @@ AS_IF([test "$BUILD_DMFILEMAPD" = "yes"], [
|
||||
@@ -1742,8 +1742,6 @@ AS_IF([test "$BUILD_DMFILEMAPD" = "yes"], [
|
||||
])
|
||||
|
||||
################################################################################
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 0c02c24208afec03aa34839cb3e102fb1c15a9c9 Mon Sep 17 00:00:00 2001
|
||||
From 8657541b91b4f2bd05ce14ec9899ff5f9f3b7d4c Mon Sep 17 00:00:00 2001
|
||||
From: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
Date: Mon, 26 Nov 2018 14:59:55 +0800
|
||||
Subject: [PATCH] do not build manual
|
||||
@@ -57,10 +57,10 @@ index 06c4b1823..90df7b09c 100644
|
||||
|
||||
ifeq ("@INTL@", "yes")
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 167587d09..557738497 100644
|
||||
index 3af73c781..f32d1f376 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -2041,7 +2041,6 @@ libdaemon/server/Makefile
|
||||
@@ -2076,7 +2076,6 @@ libdaemon/server/Makefile
|
||||
libdm/Makefile
|
||||
libdm/dm-tools/Makefile
|
||||
libdm/libdevmapper.pc
|
||||
|
||||
@@ -18,9 +18,9 @@ SRC_URI = "git://sourceware.org/git/lvm2.git;branch=main \
|
||||
file://0001-include-libgen.h-for-basename.patch \
|
||||
"
|
||||
|
||||
SRCREV = "32cfcfd151d49c4e1876a455072c593ad11eaccf"
|
||||
SRCREV = "9f81fccd65a29030bf70417e8aca659ae536e081"
|
||||
S = "${WORKDIR}/git"
|
||||
PV = "2.03.29"
|
||||
PV = "2.03.30"
|
||||
|
||||
UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\_\d+)+)"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user