9 files changed, 57 insertions, 136 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
diff --git a/meta-oe/recipes-support/lvm2/libdevmapper.bb b/meta-oe/recipes-support/lvm2/libdevmapper.bb
index be558ce1d2..3b4439c3ae 100644
--- a/meta-oe/recipes-support/lvm2/libdevmapper.bb
+++ b/meta-oe/recipes-support/lvm2/libdevmapper.bb
@@ -5,6 +5,8 @@ require lvm2.inc
 
 DEPENDS += "autoconf-archive-native"
 
+inherit nopackages
+
 TARGET_CC_ARCH += "${LDFLAGS}"
 
 do_install() {
diff --git a/meta-oe/recipes-support/lvm2/lvm2.bb b/meta-oe/recipes-support/lvm2/lvm2.bb
index 868f5a249e..f569424e27 100644
--- a/meta-oe/recipes-support/lvm2/lvm2.bb
+++ b/meta-oe/recipes-support/lvm2/lvm2.bb
@@ -1,7 +1,6 @@
 require lvm2.inc
 
 SRC_URI += " \
-            file://0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch \
             file://tweak-for-lvmdbusd.patch \
            "
 
@@ -38,7 +37,7 @@ do_install:append() {
     || true
 }
 
-PACKAGE_BEFORE_PN = "${PN}-scripts ${PN}-udevrules"
+PACKAGE_BEFORE_PN = "${PN}-scripts"
 
 SYSTEMD_PACKAGES = "${PN}"
 SYSTEMD_SERVICE:${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'dmeventd', 'lvm2-monitor.service dm-event.socket dm-event.service', '', d)} \
@@ -57,21 +56,30 @@ LVM2_PACKAGECONFIG:append:class-target = " \
 "
 
 PACKAGECONFIG[dbus] = "--enable-dbus-service,--disable-dbus-service,,python3-dbus python3-pyudev"
-PACKAGECONFIG[udev] = "--enable-udev_sync --enable-udev_rules --with-udevdir=${nonarch_base_libdir}/udev/rules.d,--disable-udev_sync --disable-udev_rules,udev,${PN}-udevrules"
+PACKAGECONFIG[udev] = "--enable-udev_sync --enable-udev_rules --with-udevdir=${nonarch_base_libdir}/udev/rules.d,--disable-udev_sync --disable-udev_rules,udev,"
 
 PACKAGES =+ "libdevmapper"
 FILES:libdevmapper = " \
     ${libdir}/libdevmapper.so.* \
     ${sbindir}/dmsetup \
     ${sbindir}/dmstats \
+    ${nonarch_base_libdir}/udev/rules.d/10-dm.rules \
+    ${nonarch_base_libdir}/udev/rules.d/13-dm-disk.rules \
+    ${nonarch_base_libdir}/udev/rules.d/95-dm-notify.rules \
 "
 
 FILES:${PN} += " \
     ${libdir}/device-mapper/*.so \
-    ${systemd_system_unitdir}/lvm2-pvscan@.service \
+    ${systemd_system_unitdir} \
     ${PYTHON_SITEPACKAGES_DIR}/lvmdbusd \
     ${datadir}/dbus-1/system-services/com.redhat.lvmdbus1.service \
+    ${nonarch_base_libdir}/udev/rules.d/11-dm-lvm.rules \
+    ${nonarch_base_libdir}/udev/rules.d/69-dm-lvm.rules \
 "
+# Remove /lib/udev from FILES:${PN} so that any new rules files that are added
+# upstream will have to be explicitly added to either FILES:${PN} or
+# FILES:libdevmapper.
+FILES:${PN}:remove = "${nonarch_base_libdir}/udev"
 
 FILES:${PN}-scripts = " \
     ${sbindir}/blkdeactivate \
@@ -79,11 +87,8 @@ FILES:${PN}-scripts = " \
     ${sbindir}/lvmconf \
     ${sbindir}/lvmdump \
 "
-# Specified explicitly for the udev rules, just in case that it does not get picked
-# up automatically:
-FILES:${PN}-udevrules = "${nonarch_base_libdir}/udev/rules.d"
+
 RDEPENDS:${PN} = "bash"
-RDEPENDS:${PN}-udevrules = "libdevmapper"
 RDEPENDS:${PN}:append:class-target = " libdevmapper"
 RDEPENDS:${PN}:append:class-nativesdk = " libdevmapper"
 
diff --git a/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-oe/recipes-support/lvm2/lvm2.inc
index 29cc7425ba..4038e83d46 100644
--- a/meta-oe/recipes-support/lvm2/lvm2.inc
+++ b/meta-oe/recipes-support/lvm2/lvm2.inc
@@ -15,18 +15,39 @@ SRC_URI = "git://sourceware.org/git/lvm2.git;branch=main \
            file://0005-do-not-build-manual.patch \
            file://0006-start-lvm2-monitor.service-after-tmp.mount.patch \
            file://reproducible-build.patch \
-           file://0001-configure.ac-check-egrep.patch \
            file://0001-include-libgen.h-for-basename.patch \
            "
 
-SRCREV = "90ec2cd92f6367c431dd8dae55d0cbe7e196734f"
-S = "${WORKDIR}/git"
-PV = "2.03.24"
+SRCREV = "0e01a5d3ae1100a6641772ab295e0185d8d6a6b0"
+PV = "2.03.33"
 
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\_\d+)+)"
 
 inherit autotools-brokensep pkgconfig systemd
 
+def get_dm_version(p):
+    import re
+
+    fn = p + '/VERSION_DM'
+    try:
+        f = open(fn, 'r')
+    except IOError:
+        return None
+
+    lines = f.readlines()
+    f.close()
+    for line in lines:
+        m = re.match(r'(\w+)[-. ](\w+)[-. ](\w+)', line.strip())
+        if m:
+            return ".".join([m.group(1), m.group(2), m.group(3)])
+
+    return None
+
+DM_VERSION = '${@get_dm_version("${S}")}'
+python do_package:prepend() {
+    d.setVar('PKGV:libdevmapper', d.getVar("DM_VERSION"))
+}
+
 LVM2_PACKAGECONFIG = "dmeventd"
 LVM2_PACKAGECONFIG:append:class-target = " \
     ${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)} \
@@ -59,7 +80,3 @@ EXTRA_OECONF = "--with-user= \
                 --with-thin-repair=${sbindir}/thin_repair \
                 --with-thin-restore=${sbindir}/thin_restore \
 "
-
-# gold doesn't like multiple dm_bitset_parse_list definitions in libdm/.exported_symbols.DM_1_02_138 and libdm/.exported_symbols.DM_1_02_129
-# after it was uncommented in the later in 2.03.12 with https://github.com/lvmteam/lvm2/commit/60eb608d66c2056a78e81f27db3da14139d9faab
-LDFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', " -fuse-ld=bfd", '', d)}"
diff --git a/meta-oe/recipes-support/lvm2/lvm2/0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch b/meta-oe/recipes-support/lvm2/lvm2/0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch
deleted file mode 100644
index 96a3d64fdf..0000000000
--- a/meta-oe/recipes-support/lvm2/lvm2/0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 2ff2a867db8d3e1c660d191a1805f9e355169c80 Mon Sep 17 00:00:00 2001
-From: Hongxu Jia <hongxu.jia@windriver.com>
-Date: Tue, 2 Mar 2021 01:33:05 -0800
-Subject: [PATCH] fix command /bin/findmnt, /bin/lsblk, /bin/sort not found
-
-In oe-core (util-linux and coreutils), the commands locates in
-${bindir} rather than /bin, add BINDIR to configure it
-
-Upstream-Status: Inappropriate [oe specific]
-
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
----
- configure.ac                | 3 +++
- scripts/blkdeactivate.sh.in | 7 ++++---
- 2 files changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index d9e7964c3..9dfdcfe01 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1704,6 +1704,8 @@ AS_IF([test -n "$MODPROBE_CMD"], [
- 
- SYSCONFDIR="$(eval echo $(eval echo $sysconfdir))"
- 
-+BINDIR="$(eval echo $(eval echo $bindir))"
-+
- SBINDIR="$(eval echo $(eval echo $sbindir))"
- LVM_PATH="$SBINDIR/lvm"
- AC_DEFINE_UNQUOTED(LVM_PATH, ["$LVM_PATH"], [Path to lvm binary.])
-@@ -1944,6 +1946,7 @@ AC_SUBST(PYTHON2DIR)
- AC_SUBST(PYTHON3)
- AC_SUBST(PYTHON3DIR)
- AC_SUBST(RT_LIBS)
-+AC_SUBST(BINDIR)
- AC_SUBST(SBINDIR)
- AC_SUBST(SELINUX_LIBS)
- AC_SUBST(SELINUX_PC)
-diff --git a/scripts/blkdeactivate.sh.in b/scripts/blkdeactivate.sh.in
-index 7c517b87b..7ef1bb766 100644
---- a/scripts/blkdeactivate.sh.in
-+++ b/scripts/blkdeactivate.sh.in
-@@ -42,13 +42,14 @@ VDO="/bin/vdo"
- 
- sbindir="@SBINDIR@"
- DMSETUP="$sbindir/dmsetup"
-+bindir="@BINDIR@"
- LVM="$sbindir/lvm"
- 
- if "$UMOUNT" --help | grep -- "--all-targets" >"$DEV_DIR/null"; then
-        UMOUNT_OPTS="--all-targets "
- else
-        UMOUNT_OPTS=""
--       FINDMNT="/bin/findmnt -r --noheadings -u -o TARGET"
-+       FINDMNT="$bindir/findmnt -r --noheadings -u -o TARGET"
-        FINDMNT_READ="read -r mnt"
- fi
- DMSETUP_OPTS=""
-@@ -57,10 +58,10 @@ MDADM_OPTS=""
- MPATHD_OPTS=""
- VDO_OPTS=""
- 
--LSBLK="/bin/lsblk -r --noheadings -o TYPE,KNAME,NAME,MOUNTPOINT"
-+LSBLK="$bindir/lsblk -r --noheadings -o TYPE,KNAME,NAME,MOUNTPOINT"
- LSBLK_VARS="local devtype local kname local name local mnt"
- LSBLK_READ="read -r devtype kname name mnt"
--SORT_MNT="/bin/sort -r -u -k 4"
-+SORT_MNT="$bindir/sort -r -u -k 4"
- 
- # Do not show tool errors by default (only done/skipping summary
- # message provided by this script) and no verbose mode by default.