summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/lvm2
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe/recipes-support/lvm2')
-rw-r--r--meta-oe/recipes-support/lvm2/files/0001-configure.ac-check-egrep.patch33
-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/files/0004-tweak-MODPROBE_CMD-for-cross-compile.patch6
-rw-r--r--meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch6
-rw-r--r--meta-oe/recipes-support/lvm2/libdevmapper.bb2
-rw-r--r--meta-oe/recipes-support/lvm2/lvm2.bb21
-rw-r--r--meta-oe/recipes-support/lvm2/lvm2.inc33
-rw-r--r--meta-oe/recipes-support/lvm2/lvm2/0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch70
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 @@
1From f261b2f1bc16c32a55a22e28bf1b2f15ac6c7a88 Mon Sep 17 00:00:00 2001
2From: Kai Kang <kai.kang@windriver.com>
3Date: Wed, 6 Dec 2023 10:24:46 +0800
4Subject: [PATCH] configure.ac: check egrep
5
6The macro AC_HEADER_STDC which requires AC_PROG_EGREP has been removed
7from configure.ac, then it fails to substitute '@EGREP@':
8
9| [GEN] command-lines-input.h
10| /bin/bash: line 2: @EGREP@: command not found
11| [GEN] command-count.h
12
13Call AC_PROG_EGREP to fix the error.
14
15Upstream-Status: Submitted [https://gitlab.com/lvmteam/lvm2/-/merge_requests/4]
16
17Signed-off-by: Kai Kang <kai.kang@windriver.com>
18---
19 configure.ac | 1 +
20 1 file changed, 1 insertion(+)
21
22diff --git a/configure.ac b/configure.ac
23index c2dbf3c9f..d9e7964c3 100644
24--- a/configure.ac
25+++ b/configure.ac
26@@ -88,6 +88,7 @@ AC_PROG_EGREP
27 AC_PROG_MAKE_SET
28 AC_PROG_MKDIR_P
29 AC_PROG_RANLIB
30+AC_PROG_EGREP
31 AC_CHECK_TOOL([READELF], [readelf])
32 AC_CHECK_TOOL(AR, ar)
33 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 @@
1From a86919ed5468f3c152114446c189b00f5f656d59 Mon Sep 17 00:00:00 2001 1From 65a04547541894b3ec56bd70510b164810cd64b3 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 90905e629..ed69662d0 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 22ae1e3bb..b0928bc04 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@@ -3407,7 +3407,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@@ -3417,7 +3417,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@@ -3425,7 +3425,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..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 @@
1From 4e7f4ea0bf89726255612a2a382c064e5923fbcd Mon Sep 17 00:00:00 2001 1From c7a63e17fc841eab5874aa5dc4e848e2bf300bf0 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 a3f341bfc..0c05eb151 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@@ -27,6 +27,7 @@
23 #include "lib/datastruct/str_list.h" 23 #include "lib/display/display.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/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 @@
1From b30f842d5d200a8217a47465d6cdd99d3805ba76 Mon Sep 17 00:00:00 2001 1From 53a879b5a285722f0cb0ee42607c1cd1102b79be Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Tue, 31 Jul 2018 15:04:29 +0800 3Date: Tue, 31 Jul 2018 15:04:29 +0800
4Subject: [PATCH] tweak MODPROBE_CMD for cross compile 4Subject: [PATCH] tweak MODPROBE_CMD for cross compile
@@ -21,10 +21,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
21 1 file changed, 2 deletions(-) 21 1 file changed, 2 deletions(-)
22 22
23diff --git a/configure.ac b/configure.ac 23diff --git a/configure.ac b/configure.ac
24index c8d81e16c..7c1c04627 100644 24index e5e5e71ce..3af73c781 100644
25--- a/configure.ac 25--- a/configure.ac
26+++ b/configure.ac 26+++ b/configure.ac
27@@ -1689,8 +1689,6 @@ AS_IF([test "$BUILD_DMFILEMAPD" = "yes"], [ 27@@ -1742,8 +1742,6 @@ AS_IF([test "$BUILD_DMFILEMAPD" = "yes"], [
28 ]) 28 ])
29 29
30 ################################################################################ 30 ################################################################################
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 @@
1From e0e06b77e067da6a01dd9b0d5582a0a1709c655d Mon Sep 17 00:00:00 2001 1From 8657541b91b4f2bd05ce14ec9899ff5f9f3b7d4c Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Mon, 26 Nov 2018 14:59:55 +0800 3Date: Mon, 26 Nov 2018 14:59:55 +0800
4Subject: [PATCH] do not build manual 4Subject: [PATCH] do not build manual
@@ -57,10 +57,10 @@ index 06c4b1823..90df7b09c 100644
57 57
58 ifeq ("@INTL@", "yes") 58 ifeq ("@INTL@", "yes")
59diff --git a/configure.ac b/configure.ac 59diff --git a/configure.ac b/configure.ac
60index 7c1c04627..5364dd68e 100644 60index 3af73c781..f32d1f376 100644
61--- a/configure.ac 61--- a/configure.ac
62+++ b/configure.ac 62+++ b/configure.ac
63@@ -2022,7 +2022,6 @@ libdaemon/server/Makefile 63@@ -2076,7 +2076,6 @@ libdaemon/server/Makefile
64 libdm/Makefile 64 libdm/Makefile
65 libdm/dm-tools/Makefile 65 libdm/dm-tools/Makefile
66 libdm/libdevmapper.pc 66 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
5 5
6DEPENDS += "autoconf-archive-native" 6DEPENDS += "autoconf-archive-native"
7 7
8inherit nopackages
9
8TARGET_CC_ARCH += "${LDFLAGS}" 10TARGET_CC_ARCH += "${LDFLAGS}"
9 11
10do_install() { 12do_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 @@
1require lvm2.inc 1require lvm2.inc
2 2
3SRC_URI += " \ 3SRC_URI += " \
4 file://0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch \
5 file://tweak-for-lvmdbusd.patch \ 4 file://tweak-for-lvmdbusd.patch \
6 " 5 "
7 6
@@ -38,7 +37,7 @@ do_install:append() {
38 || true 37 || true
39} 38}
40 39
41PACKAGE_BEFORE_PN = "${PN}-scripts ${PN}-udevrules" 40PACKAGE_BEFORE_PN = "${PN}-scripts"
42 41
43SYSTEMD_PACKAGES = "${PN}" 42SYSTEMD_PACKAGES = "${PN}"
44SYSTEMD_SERVICE:${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'dmeventd', 'lvm2-monitor.service dm-event.socket dm-event.service', '', d)} \ 43SYSTEMD_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 = " \
57" 56"
58 57
59PACKAGECONFIG[dbus] = "--enable-dbus-service,--disable-dbus-service,,python3-dbus python3-pyudev" 58PACKAGECONFIG[dbus] = "--enable-dbus-service,--disable-dbus-service,,python3-dbus python3-pyudev"
60PACKAGECONFIG[udev] = "--enable-udev_sync --enable-udev_rules --with-udevdir=${nonarch_base_libdir}/udev/rules.d,--disable-udev_sync --disable-udev_rules,udev,${PN}-udevrules" 59PACKAGECONFIG[udev] = "--enable-udev_sync --enable-udev_rules --with-udevdir=${nonarch_base_libdir}/udev/rules.d,--disable-udev_sync --disable-udev_rules,udev,"
61 60
62PACKAGES =+ "libdevmapper" 61PACKAGES =+ "libdevmapper"
63FILES:libdevmapper = " \ 62FILES:libdevmapper = " \
64 ${libdir}/libdevmapper.so.* \ 63 ${libdir}/libdevmapper.so.* \
65 ${sbindir}/dmsetup \ 64 ${sbindir}/dmsetup \
66 ${sbindir}/dmstats \ 65 ${sbindir}/dmstats \
66 ${nonarch_base_libdir}/udev/rules.d/10-dm.rules \
67 ${nonarch_base_libdir}/udev/rules.d/13-dm-disk.rules \
68 ${nonarch_base_libdir}/udev/rules.d/95-dm-notify.rules \
67" 69"
68 70
69FILES:${PN} += " \ 71FILES:${PN} += " \
70 ${libdir}/device-mapper/*.so \ 72 ${libdir}/device-mapper/*.so \
71 ${systemd_system_unitdir}/lvm2-pvscan@.service \ 73 ${systemd_system_unitdir} \
72 ${PYTHON_SITEPACKAGES_DIR}/lvmdbusd \ 74 ${PYTHON_SITEPACKAGES_DIR}/lvmdbusd \
73 ${datadir}/dbus-1/system-services/com.redhat.lvmdbus1.service \ 75 ${datadir}/dbus-1/system-services/com.redhat.lvmdbus1.service \
76 ${nonarch_base_libdir}/udev/rules.d/11-dm-lvm.rules \
77 ${nonarch_base_libdir}/udev/rules.d/69-dm-lvm.rules \
74" 78"
79# Remove /lib/udev from FILES:${PN} so that any new rules files that are added
80# upstream will have to be explicitly added to either FILES:${PN} or
81# FILES:libdevmapper.
82FILES:${PN}:remove = "${nonarch_base_libdir}/udev"
75 83
76FILES:${PN}-scripts = " \ 84FILES:${PN}-scripts = " \
77 ${sbindir}/blkdeactivate \ 85 ${sbindir}/blkdeactivate \
@@ -79,11 +87,8 @@ FILES:${PN}-scripts = " \
79 ${sbindir}/lvmconf \ 87 ${sbindir}/lvmconf \
80 ${sbindir}/lvmdump \ 88 ${sbindir}/lvmdump \
81" 89"
82# Specified explicitly for the udev rules, just in case that it does not get picked 90
83# up automatically:
84FILES:${PN}-udevrules = "${nonarch_base_libdir}/udev/rules.d"
85RDEPENDS:${PN} = "bash" 91RDEPENDS:${PN} = "bash"
86RDEPENDS:${PN}-udevrules = "libdevmapper"
87RDEPENDS:${PN}:append:class-target = " libdevmapper" 92RDEPENDS:${PN}:append:class-target = " libdevmapper"
88RDEPENDS:${PN}:append:class-nativesdk = " libdevmapper" 93RDEPENDS:${PN}:append:class-nativesdk = " libdevmapper"
89 94
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 \
15 file://0005-do-not-build-manual.patch \ 15 file://0005-do-not-build-manual.patch \
16 file://0006-start-lvm2-monitor.service-after-tmp.mount.patch \ 16 file://0006-start-lvm2-monitor.service-after-tmp.mount.patch \
17 file://reproducible-build.patch \ 17 file://reproducible-build.patch \
18 file://0001-configure.ac-check-egrep.patch \
19 file://0001-include-libgen.h-for-basename.patch \ 18 file://0001-include-libgen.h-for-basename.patch \
20 " 19 "
21 20
22SRCREV = "90ec2cd92f6367c431dd8dae55d0cbe7e196734f" 21SRCREV = "0e01a5d3ae1100a6641772ab295e0185d8d6a6b0"
23S = "${WORKDIR}/git" 22PV = "2.03.33"
24PV = "2.03.24"
25 23
26UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\_\d+)+)" 24UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\_\d+)+)"
27 25
28inherit autotools-brokensep pkgconfig systemd 26inherit autotools-brokensep pkgconfig systemd
29 27
28def get_dm_version(p):
29 import re
30
31 fn = p + '/VERSION_DM'
32 try:
33 f = open(fn, 'r')
34 except IOError:
35 return None
36
37 lines = f.readlines()
38 f.close()
39 for line in lines:
40 m = re.match(r'(\w+)[-. ](\w+)[-. ](\w+)', line.strip())
41 if m:
42 return ".".join([m.group(1), m.group(2), m.group(3)])
43
44 return None
45
46DM_VERSION = '${@get_dm_version("${S}")}'
47python do_package:prepend() {
48 d.setVar('PKGV:libdevmapper', d.getVar("DM_VERSION"))
49}
50
30LVM2_PACKAGECONFIG = "dmeventd" 51LVM2_PACKAGECONFIG = "dmeventd"
31LVM2_PACKAGECONFIG:append:class-target = " \ 52LVM2_PACKAGECONFIG:append:class-target = " \
32 ${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)} \ 53 ${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)} \
@@ -59,7 +80,3 @@ EXTRA_OECONF = "--with-user= \
59 --with-thin-repair=${sbindir}/thin_repair \ 80 --with-thin-repair=${sbindir}/thin_repair \
60 --with-thin-restore=${sbindir}/thin_restore \ 81 --with-thin-restore=${sbindir}/thin_restore \
61" 82"
62
63# 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
64# after it was uncommented in the later in 2.03.12 with https://github.com/lvmteam/lvm2/commit/60eb608d66c2056a78e81f27db3da14139d9faab
65LDFLAGS: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 @@
1From 2ff2a867db8d3e1c660d191a1805f9e355169c80 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Tue, 2 Mar 2021 01:33:05 -0800
4Subject: [PATCH] fix command /bin/findmnt, /bin/lsblk, /bin/sort not found
5
6In oe-core (util-linux and coreutils), the commands locates in
7${bindir} rather than /bin, add BINDIR to configure it
8
9Upstream-Status: Inappropriate [oe specific]
10
11Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
12---
13 configure.ac | 3 +++
14 scripts/blkdeactivate.sh.in | 7 ++++---
15 2 files changed, 7 insertions(+), 3 deletions(-)
16
17diff --git a/configure.ac b/configure.ac
18index d9e7964c3..9dfdcfe01 100644
19--- a/configure.ac
20+++ b/configure.ac
21@@ -1704,6 +1704,8 @@ AS_IF([test -n "$MODPROBE_CMD"], [
22
23 SYSCONFDIR="$(eval echo $(eval echo $sysconfdir))"
24
25+BINDIR="$(eval echo $(eval echo $bindir))"
26+
27 SBINDIR="$(eval echo $(eval echo $sbindir))"
28 LVM_PATH="$SBINDIR/lvm"
29 AC_DEFINE_UNQUOTED(LVM_PATH, ["$LVM_PATH"], [Path to lvm binary.])
30@@ -1944,6 +1946,7 @@ AC_SUBST(PYTHON2DIR)
31 AC_SUBST(PYTHON3)
32 AC_SUBST(PYTHON3DIR)
33 AC_SUBST(RT_LIBS)
34+AC_SUBST(BINDIR)
35 AC_SUBST(SBINDIR)
36 AC_SUBST(SELINUX_LIBS)
37 AC_SUBST(SELINUX_PC)
38diff --git a/scripts/blkdeactivate.sh.in b/scripts/blkdeactivate.sh.in
39index 7c517b87b..7ef1bb766 100644
40--- a/scripts/blkdeactivate.sh.in
41+++ b/scripts/blkdeactivate.sh.in
42@@ -42,13 +42,14 @@ VDO="/bin/vdo"
43
44 sbindir="@SBINDIR@"
45 DMSETUP="$sbindir/dmsetup"
46+bindir="@BINDIR@"
47 LVM="$sbindir/lvm"
48
49 if "$UMOUNT" --help | grep -- "--all-targets" >"$DEV_DIR/null"; then
50 UMOUNT_OPTS="--all-targets "
51 else
52 UMOUNT_OPTS=""
53- FINDMNT="/bin/findmnt -r --noheadings -u -o TARGET"
54+ FINDMNT="$bindir/findmnt -r --noheadings -u -o TARGET"
55 FINDMNT_READ="read -r mnt"
56 fi
57 DMSETUP_OPTS=""
58@@ -57,10 +58,10 @@ MDADM_OPTS=""
59 MPATHD_OPTS=""
60 VDO_OPTS=""
61
62-LSBLK="/bin/lsblk -r --noheadings -o TYPE,KNAME,NAME,MOUNTPOINT"
63+LSBLK="$bindir/lsblk -r --noheadings -o TYPE,KNAME,NAME,MOUNTPOINT"
64 LSBLK_VARS="local devtype local kname local name local mnt"
65 LSBLK_READ="read -r devtype kname name mnt"
66-SORT_MNT="/bin/sort -r -u -k 4"
67+SORT_MNT="$bindir/sort -r -u -k 4"
68
69 # Do not show tool errors by default (only done/skipping summary
70 # message provided by this script) and no verbose mode by default.