8 files changed, 50 insertions, 92 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 3c4a3a151d..fb58793a17 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
@@ -1,7 +1,7 @@
-From ea66faf68c93735edb1f2691cd7364b8cab83fef Mon Sep 17 00:00:00 2001
+From 44695f332e206e1db43d50163e1bce0bedf75fb7 Mon Sep 17 00:00:00 2001
 From: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
 Date: Mon, 26 Nov 2018 14:53:09 +0800
-Subject: [PATCH 1/3] Avoid bashisms in init scripts
+Subject: [PATCH] Avoid bashisms in init scripts
 
 Upstream-Status: Inappropriate
 
@@ -19,7 +19,7 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
  5 files changed, 10 insertions(+), 10 deletions(-)
 
 diff --git a/scripts/blk_availability_init_red_hat.in b/scripts/blk_availability_init_red_hat.in
-index 347c395..b2e9cf9 100644
+index 347c39574..b2e9cf932 100644
 --- a/scripts/blk_availability_init_red_hat.in
 +++ b/scripts/blk_availability_init_red_hat.in
 @@ -1,4 +1,4 @@
@@ -37,7 +37,7 @@ index 347c395..b2e9cf9 100644
         ;;
  esac
 diff --git a/scripts/cmirrord_init_red_hat.in b/scripts/cmirrord_init_red_hat.in
-index c82f8f5..a3a321d 100755
+index c82f8f547..a3a321d9c 100755
 --- a/scripts/cmirrord_init_red_hat.in
 +++ b/scripts/cmirrord_init_red_hat.in
 @@ -1,4 +1,4 @@
@@ -56,7 +56,7 @@ index c82f8f5..a3a321d 100755
  esac
  
 diff --git a/scripts/lvm2_lvmpolld_init_red_hat.in b/scripts/lvm2_lvmpolld_init_red_hat.in
-index 176ff5d..825f6ad 100644
+index 176ff5dcb..825f6ad84 100644
 --- a/scripts/lvm2_lvmpolld_init_red_hat.in
 +++ b/scripts/lvm2_lvmpolld_init_red_hat.in
 @@ -1,4 +1,4 @@
@@ -75,7 +75,7 @@ index 176ff5d..825f6ad 100644
  esac
  
 diff --git a/scripts/lvm2_monitoring_init_red_hat.in b/scripts/lvm2_monitoring_init_red_hat.in
-index 95e4125..dff89cd 100644
+index 95e4125a0..dff89cd38 100644
 --- a/scripts/lvm2_monitoring_init_red_hat.in
 +++ b/scripts/lvm2_monitoring_init_red_hat.in
 @@ -1,4 +1,4 @@
@@ -94,7 +94,7 @@ index 95e4125..dff89cd 100644
  esac
  
 diff --git a/scripts/lvm2_monitoring_init_rhel4 b/scripts/lvm2_monitoring_init_rhel4
-index 8eb06c5..2e8d0f7 100644
+index 8eb06c509..2e8d0f71e 100644
 --- a/scripts/lvm2_monitoring_init_rhel4
 +++ b/scripts/lvm2_monitoring_init_rhel4
 @@ -1,4 +1,4 @@
@@ -112,6 +112,3 @@ index 8eb06c5..2e8d0f7 100644
         ;;
  esac
  
--- 
-2.7.4
-
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 474c2f8ac7..0000000000
--- a/meta-oe/recipes-support/lvm2/files/0001-configure.ac-check-egrep.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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 2e52498f9..d9462e22c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -78,6 +78,7 @@ AC_PROG_LN_S
- 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)
--- 
-2.34.1
-
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 f46d7f7014..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 e3103459416616d3b8508e7176e897b0ae6c90f2 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
@@ -14,18 +14,17 @@ http://git.alpinelinux.org/cgit/aports/tree/main/lvm2/fix-stdio-usage.patch
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 Signed-off-by: Dengke Du <dengke.du@windriver.com>
 
----
 Upstream-Status: Pending
-
+---
  lib/log/log.c      | 6 ++++++
  tools/lvmcmdline.c | 6 +++---
  2 files changed, 9 insertions(+), 3 deletions(-)
 
-Index: LVM2.2.02.177/lib/log/log.c
-===================================================================
---- LVM2.2.02.177.orig/lib/log/log.c
-+++ LVM2.2.02.177/lib/log/log.c
-@@ -161,6 +161,7 @@ static void _check_and_replace_standard_
+diff --git a/lib/log/log.c b/lib/log/log.c
+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_
   * Close and reopen standard stream on file descriptor fd.
   */
  int reopen_standard_stream(FILE **stream, const char *mode)
@@ -33,7 +32,7 @@ Index: LVM2.2.02.177/lib/log/log.c
  {
         int fd, fd_copy, new_fd;
         const char *name;
-@@ -207,6 +208,11 @@ int reopen_standard_stream(FILE **stream
+@@ -211,6 +212,11 @@ int reopen_standard_stream(FILE **stream, const char *mode)
         *stream = new_stream;
         return 1;
  }
@@ -45,11 +44,11 @@ Index: LVM2.2.02.177/lib/log/log.c
  
  void init_log_fn(lvm2_log_fn_t log_fn)
  {
-Index: LVM2.2.02.177/tools/lvmcmdline.c
-===================================================================
---- LVM2.2.02.177.orig/tools/lvmcmdline.c
-+++ LVM2.2.02.177/tools/lvmcmdline.c
-@@ -3095,7 +3095,7 @@ static int _check_standard_fds(void)
+diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
+index 22ae1e3bb..b0928bc04 100644
+--- a/tools/lvmcmdline.c
++++ b/tools/lvmcmdline.c
+@@ -3407,7 +3407,7 @@ static int _check_standard_fds(void)
         int err = is_valid_fd(STDERR_FILENO);
  
         if (!is_valid_fd(STDIN_FILENO) &&
@@ -58,7 +57,7 @@ Index: LVM2.2.02.177/tools/lvmcmdline.c
                 if (err)
                         perror("stdin stream open");
                 else
-@@ -3105,7 +3105,7 @@ static int _check_standard_fds(void)
+@@ -3417,7 +3417,7 @@ static int _check_standard_fds(void)
         }
  
         if (!is_valid_fd(STDOUT_FILENO) &&
@@ -67,7 +66,7 @@ Index: LVM2.2.02.177/tools/lvmcmdline.c
                 if (err)
                         perror("stdout stream open");
                 /* else no stdout */
-@@ -3113,7 +3113,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 7add3a7bb1..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 1b9677f40ac547ba19d1cdbfd700901eab0a0d0b 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,17 +16,14 @@ 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 1422f5d05..8215811bd 100644
+index a3f341bfc..0c05eb151 100644
 --- a/lib/device/device_id.c
 +++ b/lib/device/device_id.c
-@@ -25,6 +25,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>
  #include <fcntl.h>
  #include <unistd.h>
--- 
-2.44.0
-
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 ed9972a5f9..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,7 +1,7 @@
-From 3bba45890985b877b823836e78a1c8ac3c878856 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 4/4] tweak MODPROBE_CMD for cross compile
+Subject: [PATCH] tweak MODPROBE_CMD for cross compile
 
 Lvm uses variable MODPROBE_CMD at runtime, so build time detection of modprobe
 is incorrect.
@@ -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 b43d8b9be..efe3062c1 100644
+index e5e5e71ce..3af73c781 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1646,8 +1646,6 @@ AS_IF([test "$BUILD_DMFILEMAPD" = "yes"], [
+@@ -1742,8 +1742,6 @@ AS_IF([test "$BUILD_DMFILEMAPD" = "yes"], [
  ])
  
  ################################################################################
@@ -33,6 +33,3 @@ index b43d8b9be..efe3062c1 100644
  AS_IF([test -n "$MODPROBE_CMD"], [
         AC_DEFINE_UNQUOTED([MODPROBE_CMD], ["$MODPROBE_CMD"], [The path to 'modprobe', if available.])
  ])
--- 
-2.7.4
-
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 7979efbefb..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,7 +1,7 @@
-From 103ac1c1200df8190372d973e004776cffe8e659 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 2/3] do not build manual
+Subject: [PATCH] do not build manual
 
 On some host (ubuntu 1404), build manual failed.
 ...
@@ -26,7 +26,7 @@ Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
  2 files changed, 3 insertions(+), 4 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index 3b7e0ec..37f14eb 100644
+index 06c4b1823..90df7b09c 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -18,7 +18,7 @@ top_builddir = @top_builddir@
@@ -47,7 +47,7 @@ index 3b7e0ec..37f14eb 100644
      libdaemon lib tools daemons libdm \
      udev po
  tools.distclean: test.distclean
-@@ -59,7 +59,7 @@ unit-test  run-unit-test: test
+@@ -59,7 +59,7 @@ unit-test  run-unit-test: test libdm
  
  daemons.device-mapper: libdm.device-mapper
  tools.device-mapper: libdm.device-mapper
@@ -57,10 +57,10 @@ index 3b7e0ec..37f14eb 100644
  
  ifeq ("@INTL@", "yes")
 diff --git a/configure.ac b/configure.ac
-index 6def519..18a5c97 100644
+index 3af73c781..f32d1f376 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2018,7 +2018,6 @@ libdaemon/server/Makefile
+@@ -2076,7 +2076,6 @@ libdaemon/server/Makefile
  libdm/Makefile
  libdm/dm-tools/Makefile
  libdm/libdevmapper.pc
@@ -68,6 +68,3 @@ index 6def519..18a5c97 100644
  po/Makefile
  scripts/lvm2-pvscan.service
  scripts/blkdeactivate.sh
--- 
-2.25.1
-
diff --git a/meta-oe/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch b/meta-oe/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch
index 5b9b2d5748..2d49820057 100644
--- a/meta-oe/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch
+++ b/meta-oe/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch
@@ -1,4 +1,4 @@
-From e213ed33a28704f6f538df41a91b7ce95594a4f8 Mon Sep 17 00:00:00 2001
+From 20a110ade91c73f4cb3883a3a9676708a93ca786 Mon Sep 17 00:00:00 2001
 From: Hongxu Jia <hongxu.jia@windriver.com>
 Date: Tue, 15 Oct 2019 18:12:54 +0800
 Subject: [PATCH] start lvm2-monitor.service after tmp.mount
@@ -19,7 +19,7 @@ Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/scripts/lvm2_monitoring_systemd_red_hat.service.in b/scripts/lvm2_monitoring_systemd_red_hat.service.in
-index c0c96e3..2a99a37 100644
+index c0c96e316..2a99a379d 100644
 --- a/scripts/lvm2_monitoring_systemd_red_hat.service.in
 +++ b/scripts/lvm2_monitoring_systemd_red_hat.service.in
 @@ -2,7 +2,7 @@
@@ -31,6 +31,3 @@ index c0c96e3..2a99a37 100644
  Before=local-fs-pre.target shutdown.target
  DefaultDependencies=no
  Conflicts=shutdown.target
--- 
-2.25.1
-
diff --git a/meta-oe/recipes-support/lvm2/files/reproducible-build.patch b/meta-oe/recipes-support/lvm2/files/reproducible-build.patch
index 3f53db9e5c..ca632d213f 100644
--- a/meta-oe/recipes-support/lvm2/files/reproducible-build.patch
+++ b/meta-oe/recipes-support/lvm2/files/reproducible-build.patch
@@ -1,14 +1,21 @@
-configure.ac:  override CONFIGURE_LINE
+From f5c6fabbdf2e7bfa105658b9dfe45d2ab86f34bb Mon Sep 17 00:00:00 2001
+From: Joe Slater <joe.slater@windriver.com>
+Date: Fri, 17 Jul 2020 13:59:56 -0700
+Subject: [PATCH] configure.ac:  override CONFIGURE_LINE
 
 For reproducible binaries, we need to report a constant CONFIGURE_LINE.
 
 Upstream-Status: Pending
 
 Signed-off-by: Joe Slater <joe.slater@windriver.com>
+---
+ configure.ac | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
 
-
---- git.orig/configure.ac
-+++ git/configure.ac
+diff --git a/configure.ac b/configure.ac
+index 5364dd68e..c2dbf3c9f 100644
+--- a/configure.ac
++++ b/configure.ac
 @@ -15,7 +15,15 @@ AC_PREREQ(2.69)
  ################################################################################
  dnl -- Process this file with autoconf to produce a configure script.