5 files changed, 17 insertions, 50 deletions

diff --git a/meta-oe/recipes-support/lvm2/files/0001-configure.ac-check-egrep.patch b/meta-oe/recipes-support/lvm2/files/0001-configure.ac-check-egrep.patch
deleted file mode 100644
index f4b0f913d8..0000000000
--- a/meta-oe/recipes-support/lvm2/files/0001-configure.ac-check-egrep.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From f261b2f1bc16c32a55a22e28bf1b2f15ac6c7a88 Mon Sep 17 00:00:00 2001
-From: Kai Kang <kai.kang@windriver.com>
-Date: Wed, 6 Dec 2023 10:24:46 +0800
-Subject: [PATCH] configure.ac: check egrep
-
-The macro AC_HEADER_STDC which requires AC_PROG_EGREP has been removed
-from configure.ac, then it fails to substitute '@EGREP@':
-
-|     [GEN] command-lines-input.h
-| /bin/bash: line 2: @EGREP@: command not found
-|     [GEN] command-count.h
-
-Call AC_PROG_EGREP to fix the error.
-
-Upstream-Status: Submitted [https://gitlab.com/lvmteam/lvm2/-/merge_requests/4]
-
-Signed-off-by: Kai Kang <kai.kang@windriver.com>
----
- configure.ac | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/configure.ac b/configure.ac
-index c2dbf3c9f..d9e7964c3 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -88,6 +88,7 @@ AC_PROG_EGREP
- AC_PROG_MAKE_SET
- AC_PROG_MKDIR_P
- AC_PROG_RANLIB
-+AC_PROG_EGREP
- AC_CHECK_TOOL([READELF], [readelf])
- AC_CHECK_TOOL(AR, ar)
- AC_PATH_TOOL(CFLOW_CMD, cflow)
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..1f6b89f2b6 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 @@
-From a86919ed5468f3c152114446c189b00f5f656d59 Mon Sep 17 00:00:00 2001
+From 65a04547541894b3ec56bd70510b164810cd64b3 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
@@ -21,7 +21,7 @@ Upstream-Status: Pending
  2 files changed, 9 insertions(+), 3 deletions(-)
 
 diff --git a/lib/log/log.c b/lib/log/log.c
-index 7b88252f0..e1720098a 100644
+index 90905e629..ed69662d0 100644
 --- a/lib/log/log.c
 +++ b/lib/log/log.c
 @@ -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
  void init_log_fn(lvm2_log_fn_t log_fn)
  {
 diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
-index 3fd23a521..c2ee39905 100644
+index 22ae1e3bb..b0928bc04 100644
 --- a/tools/lvmcmdline.c
 +++ b/tools/lvmcmdline.c
-@@ -3380,7 +3380,7 @@ static int _check_standard_fds(void)
+@@ -3407,7 +3407,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 3fd23a521..c2ee39905 100644
                 if (err)
                         perror("stdin stream open");
                 else
-@@ -3390,7 +3390,7 @@ static int _check_standard_fds(void)
+@@ -3417,7 +3417,7 @@ static int _check_standard_fds(void)
         }
  
         if (!is_valid_fd(STDOUT_FILENO) &&
@@ -66,7 +66,7 @@ index 3fd23a521..c2ee39905 100644
                 if (err)
                         perror("stdout stream open");
                 /* else no stdout */
-@@ -3398,7 +3398,7 @@ static int _check_standard_fds(void)
+@@ -3425,7 +3425,7 @@ static int _check_standard_fds(void)
         }
  
         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..2fcbc12b22 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 @@
-From 4e7f4ea0bf89726255612a2a382c064e5923fbcd Mon Sep 17 00:00:00 2001
+From c7a63e17fc841eab5874aa5dc4e848e2bf300bf0 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Mon, 25 Mar 2024 13:07:28 -0700
 Subject: [PATCH] include libgen.h for basename
@@ -16,12 +16,12 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/lib/device/device_id.c b/lib/device/device_id.c
-index 2b183810a..53467cbbb 100644
+index a3f341bfc..0c05eb151 100644
 --- a/lib/device/device_id.c
 +++ b/lib/device/device_id.c
-@@ -26,6 +26,7 @@
- #include "lib/datastruct/str_list.h"
- #include "lib/metadata/metadata-exported.h"
+@@ -27,6 +27,7 @@
+ #include "lib/display/display.h"
+ #include "device_mapper/misc/dm-ioctl.h"
  
 +#include <libgen.h>
  #include <sys/stat.h>
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 6435c3fd92..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 @@
-From b30f842d5d200a8217a47465d6cdd99d3805ba76 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 c8d81e16c..7c1c04627 100644
+index e5e5e71ce..3af73c781 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1689,8 +1689,6 @@ AS_IF([test "$BUILD_DMFILEMAPD" = "yes"], [
+@@ -1742,8 +1742,6 @@ AS_IF([test "$BUILD_DMFILEMAPD" = "yes"], [
  ])
  
  ################################################################################
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 e7aaad4d0e..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 @@
-From e0e06b77e067da6a01dd9b0d5582a0a1709c655d 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 7c1c04627..5364dd68e 100644
+index 3af73c781..f32d1f376 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2022,7 +2022,6 @@ libdaemon/server/Makefile
+@@ -2076,7 +2076,6 @@ libdaemon/server/Makefile
  libdm/Makefile
  libdm/dm-tools/Makefile
  libdm/libdevmapper.pc