7 files changed, 13 insertions, 12 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 1f6b89f2b6..e157c5518e 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
@@ -48,7 +48,7 @@ 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)
+@@ -3427,7 +3427,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 22ae1e3bb..b0928bc04 100644
                 if (err)
                         perror("stdin stream open");
                 else
-@@ -3417,7 +3417,7 @@ static int _check_standard_fds(void)
+@@ -3437,7 +3437,7 @@ static int _check_standard_fds(void)
         }
  
         if (!is_valid_fd(STDOUT_FILENO) &&
@@ -66,7 +66,7 @@ index 22ae1e3bb..b0928bc04 100644
                 if (err)
                         perror("stdout stream open");
                 /* else no stdout */
-@@ -3425,7 +3425,7 @@ static int _check_standard_fds(void)
+@@ -3445,7 +3445,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 2fcbc12b22..c2c83dbb7e 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
@@ -21,7 +21,7 @@ index a3f341bfc..0c05eb151 100644
 +++ b/lib/device/device_id.c
 @@ -27,6 +27,7 @@
  #include "lib/display/display.h"
- #include "device_mapper/misc/dm-ioctl.h"
+ #include "libdm/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 ac5c440e4e..49f8d27c00 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
@@ -24,7 +24,7 @@ diff --git a/configure.ac b/configure.ac
 index e5e5e71ce..3af73c781 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1742,8 +1742,6 @@ AS_IF([test "$BUILD_DMFILEMAPD" = "yes"], [
+@@ -1746,8 +1746,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 f7a85b4b3f..c2d4da5c41 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
@@ -47,7 +47,7 @@ index 06c4b1823..90df7b09c 100644
      libdaemon lib tools daemons libdm \
      udev po
  tools.distclean: test.distclean
-@@ -59,7 +59,7 @@ unit-test  run-unit-test: test libdm
+@@ -57,7 +57,7 @@ unit-test  run-unit-test: test libdm
  
  daemons.device-mapper: libdm.device-mapper
  tools.device-mapper: libdm.device-mapper
@@ -60,7 +60,7 @@ diff --git a/configure.ac b/configure.ac
 index 3af73c781..f32d1f376 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2076,7 +2076,6 @@ libdaemon/server/Makefile
+@@ -2083,7 +2083,6 @@ libdaemon/server/Makefile
  libdm/Makefile
  libdm/dm-tools/Makefile
  libdm/libdevmapper.pc
diff --git a/meta-oe/recipes-support/lvm2/files/reproducible-build.patch b/meta-oe/recipes-support/lvm2/files/reproducible-build.patch
index ca632d213f..f6c561aeb1 100644
--- a/meta-oe/recipes-support/lvm2/files/reproducible-build.patch
+++ b/meta-oe/recipes-support/lvm2/files/reproducible-build.patch
@@ -16,7 +16,7 @@ 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)
+@@ -14,7 +14,15 @@ AC_PREREQ(2.69)
  ################################################################################
  dnl -- Process this file with autoconf to produce a configure script.
  AC_INIT
diff --git a/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-oe/recipes-support/lvm2/lvm2.inc
index 9e6bd807a2..c2a88a2917 100644
--- a/meta-oe/recipes-support/lvm2/lvm2.inc
+++ b/meta-oe/recipes-support/lvm2/lvm2.inc
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12713b4d9386533feeb07d6e4831765a \
 
 DEPENDS += "libaio"
 
-SRC_URI = "git://sourceware.org/git/lvm2.git;branch=main \
+SRC_URI = "git://sourceware.org/git/lvm2.git;branch=main;tag=${PV_TAG} \
            file://lvm.conf \
            file://0001-implement-libc-specific-reopen_stream.patch \
            file://0004-tweak-MODPROBE_CMD-for-cross-compile.patch \
@@ -18,8 +18,9 @@ SRC_URI = "git://sourceware.org/git/lvm2.git;branch=main \
            file://0001-include-libgen.h-for-basename.patch \
            "
 
-SRCREV = "657e10bd75fcb3dffbd40bb1ffc6f1bfd768a10e"
-PV = "2.03.38"
+SRCREV = "6c5b6cee9f21908bdaff830c210222cc7e08f1ab"
+PV = "2.03.39"
+PV_TAG = "v${@d.getVar('PV').replace('.', '_')}"
 
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\_\d+)+)"
 
diff --git a/meta-oe/recipes-support/lvm2/lvm2/tweak-for-lvmdbusd.patch b/meta-oe/recipes-support/lvm2/lvm2/tweak-for-lvmdbusd.patch
index 200f2f044a..fd8faaf1fe 100644
--- a/meta-oe/recipes-support/lvm2/lvm2/tweak-for-lvmdbusd.patch
+++ b/meta-oe/recipes-support/lvm2/lvm2/tweak-for-lvmdbusd.patch
@@ -21,7 +21,7 @@ diff --git a/configure.ac b/configure.ac
 index 9dfdcfe01..fcf5c8b78 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1282,8 +1282,8 @@ AS_IF([test "$BUILD_LVMDBUSD" = "yes"], [
+@@ -1338,8 +1338,8 @@ AS_IF([test "$BUILD_LVMDBUSD" = "yes"], [
         AS_IF([test "$PYTHON3_BINDINGS" = "yes"], [PYTHON_BINDINGS="yes"])
  
         # To get this macro, install autoconf-archive package then run autoreconf