summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch12
-rw-r--r--meta-oe/recipes-support/lvm2/files/0001-include-libgen.h-for-basename.patch10
-rw-r--r--meta-oe/recipes-support/lvm2/lvm2.inc4
3 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 e11ac5ac08..196de644cc 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 @@
1From a86919ed5468f3c152114446c189b00f5f656d59 Mon Sep 17 00:00:00 2001 1From e2f24ea066e6dfb9f13f623009034acbf4ae8818 Mon Sep 17 00:00:00 2001
2From: Dengke Du <dengke.du@windriver.com> 2From: Dengke Du <dengke.du@windriver.com>
3Date: Tue, 25 Oct 2016 11:49:40 +0000 3Date: Tue, 25 Oct 2016 11:49:40 +0000
4Subject: [PATCH] implement libc specific reopen_stream 4Subject: [PATCH] implement libc specific reopen_stream
@@ -21,7 +21,7 @@ Upstream-Status: Pending
21 2 files changed, 9 insertions(+), 3 deletions(-) 21 2 files changed, 9 insertions(+), 3 deletions(-)
22 22
23diff --git a/lib/log/log.c b/lib/log/log.c 23diff --git a/lib/log/log.c b/lib/log/log.c
24index 7b88252f0..e1720098a 100644 24index eafb3ef1c..ff3d751bf 100644
25--- a/lib/log/log.c 25--- a/lib/log/log.c
26+++ b/lib/log/log.c 26+++ b/lib/log/log.c
27@@ -165,6 +165,7 @@ static void _check_and_replace_standard_log_streams(FILE *old_stream, FILE *new_ 27@@ -165,6 +165,7 @@ static void _check_and_replace_standard_log_streams(FILE *old_stream, FILE *new_
@@ -45,10 +45,10 @@ index 7b88252f0..e1720098a 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 {
47diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c 47diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
48index 3fd23a521..c2ee39905 100644 48index 1b2f7f47c..e0674d42d 100644
49--- a/tools/lvmcmdline.c 49--- a/tools/lvmcmdline.c
50+++ b/tools/lvmcmdline.c 50+++ b/tools/lvmcmdline.c
51@@ -3380,7 +3380,7 @@ static int _check_standard_fds(void) 51@@ -3378,7 +3378,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 3fd23a521..c2ee39905 100644
57 if (err) 57 if (err)
58 perror("stdin stream open"); 58 perror("stdin stream open");
59 else 59 else
60@@ -3390,7 +3390,7 @@ static int _check_standard_fds(void) 60@@ -3388,7 +3388,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 3fd23a521..c2ee39905 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@@ -3398,7 +3398,7 @@ static int _check_standard_fds(void) 69@@ -3396,7 +3396,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/0001-include-libgen.h-for-basename.patch b/meta-oe/recipes-support/lvm2/files/0001-include-libgen.h-for-basename.patch
index 83a7f936b1..c57bff865a 100644
--- a/meta-oe/recipes-support/lvm2/files/0001-include-libgen.h-for-basename.patch
+++ b/meta-oe/recipes-support/lvm2/files/0001-include-libgen.h-for-basename.patch
@@ -1,4 +1,4 @@
1From 4e7f4ea0bf89726255612a2a382c064e5923fbcd Mon Sep 17 00:00:00 2001 1From 4e2dc175e99792d84873a4785ff1524845267c3e Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 25 Mar 2024 13:07:28 -0700 3Date: Mon, 25 Mar 2024 13:07:28 -0700
4Subject: [PATCH] include libgen.h for basename 4Subject: [PATCH] include libgen.h for basename
@@ -16,12 +16,12 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
16 1 file changed, 1 insertion(+) 16 1 file changed, 1 insertion(+)
17 17
18diff --git a/lib/device/device_id.c b/lib/device/device_id.c 18diff --git a/lib/device/device_id.c b/lib/device/device_id.c
19index 2b183810a..53467cbbb 100644 19index b3330f2ba..291bd5c73 100644
20--- a/lib/device/device_id.c 20--- a/lib/device/device_id.c
21+++ b/lib/device/device_id.c 21+++ b/lib/device/device_id.c
22@@ -26,6 +26,7 @@ 22@@ -28,6 +28,7 @@
23 #include "lib/datastruct/str_list.h" 23 #include "lib/activate/activate.h"
24 #include "lib/metadata/metadata-exported.h" 24 #include "device_mapper/misc/dm-ioctl.h"
25 25
26+#include <libgen.h> 26+#include <libgen.h>
27 #include <sys/stat.h> 27 #include <sys/stat.h>
diff --git a/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-oe/recipes-support/lvm2/lvm2.inc
index 29cc7425ba..3f90bf2788 100644
--- a/meta-oe/recipes-support/lvm2/lvm2.inc
+++ b/meta-oe/recipes-support/lvm2/lvm2.inc
@@ -19,9 +19,9 @@ SRC_URI = "git://sourceware.org/git/lvm2.git;branch=main \
19 file://0001-include-libgen.h-for-basename.patch \ 19 file://0001-include-libgen.h-for-basename.patch \
20 " 20 "
21 21
22SRCREV = "90ec2cd92f6367c431dd8dae55d0cbe7e196734f" 22SRCREV = "0eef5ab6e14a45e6d2eacbc0bb744dbb33c16a7a"
23S = "${WORKDIR}/git" 23S = "${WORKDIR}/git"
24PV = "2.03.24" 24PV = "2.03.25"
25 25
26UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\_\d+)+)" 26UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\_\d+)+)"
27 27