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-Avoid-bashisms-in-init-scripts.patch17
-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.patch31
-rw-r--r--meta-oe/recipes-support/lvm2/files/0001-include-libgen.h-for-basename.patch13
-rw-r--r--meta-oe/recipes-support/lvm2/files/0004-tweak-MODPROBE_CMD-for-cross-compile.patch11
-rw-r--r--meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch15
-rw-r--r--meta-oe/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch7
-rw-r--r--meta-oe/recipes-support/lvm2/files/reproducible-build.patch15
-rw-r--r--meta-oe/recipes-support/lvm2/libdevmapper.bb (renamed from meta-oe/recipes-support/lvm2/libdevmapper_2.03.22.bb)2
-rw-r--r--meta-oe/recipes-support/lvm2/lvm2.bb (renamed from meta-oe/recipes-support/lvm2/lvm2_2.03.22.bb)24
-rw-r--r--meta-oe/recipes-support/lvm2/lvm2.inc32
-rw-r--r--meta-oe/recipes-support/lvm2/lvm2/0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch73
-rw-r--r--meta-oe/recipes-support/lvm2/lvm2/0001-lvmdbusd-create-dirs-for-lock-file.patch29
-rw-r--r--meta-oe/recipes-support/lvm2/lvm2/tweak-for-lvmdbusd.patch13
14 files changed, 100 insertions, 215 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 @@
1From ea66faf68c93735edb1f2691cd7364b8cab83fef Mon Sep 17 00:00:00 2001 1From 44695f332e206e1db43d50163e1bce0bedf75fb7 Mon Sep 17 00:00:00 2001
2From: Peter Kjellerstedt <peter.kjellerstedt@axis.com> 2From: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
3Date: Mon, 26 Nov 2018 14:53:09 +0800 3Date: Mon, 26 Nov 2018 14:53:09 +0800
4Subject: [PATCH 1/3] Avoid bashisms in init scripts 4Subject: [PATCH] Avoid bashisms in init scripts
5 5
6Upstream-Status: Inappropriate 6Upstream-Status: Inappropriate
7 7
@@ -19,7 +19,7 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
19 5 files changed, 10 insertions(+), 10 deletions(-) 19 5 files changed, 10 insertions(+), 10 deletions(-)
20 20
21diff --git a/scripts/blk_availability_init_red_hat.in b/scripts/blk_availability_init_red_hat.in 21diff --git a/scripts/blk_availability_init_red_hat.in b/scripts/blk_availability_init_red_hat.in
22index 347c395..b2e9cf9 100644 22index 347c39574..b2e9cf932 100644
23--- a/scripts/blk_availability_init_red_hat.in 23--- a/scripts/blk_availability_init_red_hat.in
24+++ b/scripts/blk_availability_init_red_hat.in 24+++ b/scripts/blk_availability_init_red_hat.in
25@@ -1,4 +1,4 @@ 25@@ -1,4 +1,4 @@
@@ -37,7 +37,7 @@ index 347c395..b2e9cf9 100644
37 ;; 37 ;;
38 esac 38 esac
39diff --git a/scripts/cmirrord_init_red_hat.in b/scripts/cmirrord_init_red_hat.in 39diff --git a/scripts/cmirrord_init_red_hat.in b/scripts/cmirrord_init_red_hat.in
40index c82f8f5..a3a321d 100755 40index c82f8f547..a3a321d9c 100755
41--- a/scripts/cmirrord_init_red_hat.in 41--- a/scripts/cmirrord_init_red_hat.in
42+++ b/scripts/cmirrord_init_red_hat.in 42+++ b/scripts/cmirrord_init_red_hat.in
43@@ -1,4 +1,4 @@ 43@@ -1,4 +1,4 @@
@@ -56,7 +56,7 @@ index c82f8f5..a3a321d 100755
56 esac 56 esac
57 57
58diff --git a/scripts/lvm2_lvmpolld_init_red_hat.in b/scripts/lvm2_lvmpolld_init_red_hat.in 58diff --git a/scripts/lvm2_lvmpolld_init_red_hat.in b/scripts/lvm2_lvmpolld_init_red_hat.in
59index 176ff5d..825f6ad 100644 59index 176ff5dcb..825f6ad84 100644
60--- a/scripts/lvm2_lvmpolld_init_red_hat.in 60--- a/scripts/lvm2_lvmpolld_init_red_hat.in
61+++ b/scripts/lvm2_lvmpolld_init_red_hat.in 61+++ b/scripts/lvm2_lvmpolld_init_red_hat.in
62@@ -1,4 +1,4 @@ 62@@ -1,4 +1,4 @@
@@ -75,7 +75,7 @@ index 176ff5d..825f6ad 100644
75 esac 75 esac
76 76
77diff --git a/scripts/lvm2_monitoring_init_red_hat.in b/scripts/lvm2_monitoring_init_red_hat.in 77diff --git a/scripts/lvm2_monitoring_init_red_hat.in b/scripts/lvm2_monitoring_init_red_hat.in
78index 95e4125..dff89cd 100644 78index 95e4125a0..dff89cd38 100644
79--- a/scripts/lvm2_monitoring_init_red_hat.in 79--- a/scripts/lvm2_monitoring_init_red_hat.in
80+++ b/scripts/lvm2_monitoring_init_red_hat.in 80+++ b/scripts/lvm2_monitoring_init_red_hat.in
81@@ -1,4 +1,4 @@ 81@@ -1,4 +1,4 @@
@@ -94,7 +94,7 @@ index 95e4125..dff89cd 100644
94 esac 94 esac
95 95
96diff --git a/scripts/lvm2_monitoring_init_rhel4 b/scripts/lvm2_monitoring_init_rhel4 96diff --git a/scripts/lvm2_monitoring_init_rhel4 b/scripts/lvm2_monitoring_init_rhel4
97index 8eb06c5..2e8d0f7 100644 97index 8eb06c509..2e8d0f71e 100644
98--- a/scripts/lvm2_monitoring_init_rhel4 98--- a/scripts/lvm2_monitoring_init_rhel4
99+++ b/scripts/lvm2_monitoring_init_rhel4 99+++ b/scripts/lvm2_monitoring_init_rhel4
100@@ -1,4 +1,4 @@ 100@@ -1,4 +1,4 @@
@@ -112,6 +112,3 @@ index 8eb06c5..2e8d0f7 100644
112 ;; 112 ;;
113 esac 113 esac
114 114
115--
1162.7.4
117
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 @@
1configure.ac: check egrep
2
3The macro AC_HEADER_STDC which requires AC_PROG_EGREP has been removed
4from configure.ac, then it fails to substitute '@EGREP@':
5
6| [GEN] command-lines-input.h
7| /bin/bash: line 2: @EGREP@: command not found
8| [GEN] command-count.h
9
10Call AC_PROG_EGREP to fix the error.
11
12Upstream-Status: Submitted [https://gitlab.com/lvmteam/lvm2/-/merge_requests/4]
13
14Signed-off-by: Kai Kang <kai.kang@windriver.com>
15---
16 configure.ac | 1 +
17 1 file changed, 1 insertion(+)
18
19diff --git a/configure.ac b/configure.ac
20index 2e52498f9..d9462e22c 100644
21--- a/configure.ac
22+++ b/configure.ac
23@@ -78,6 +78,7 @@ AC_PROG_LN_S
24 AC_PROG_MAKE_SET
25 AC_PROG_MKDIR_P
26 AC_PROG_RANLIB
27+AC_PROG_EGREP
28 AC_CHECK_TOOL([READELF], [readelf])
29 AC_CHECK_TOOL(AR, ar)
30 AC_PATH_TOOL(CFLOW_CMD, cflow)
31--
322.34.1
33
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 @@
1From e3103459416616d3b8508e7176e897b0ae6c90f2 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
@@ -14,18 +14,17 @@ http://git.alpinelinux.org/cgit/aports/tree/main/lvm2/fix-stdio-usage.patch
14Signed-off-by: Khem Raj <raj.khem@gmail.com> 14Signed-off-by: Khem Raj <raj.khem@gmail.com>
15Signed-off-by: Dengke Du <dengke.du@windriver.com> 15Signed-off-by: Dengke Du <dengke.du@windriver.com>
16 16
17---
18Upstream-Status: Pending 17Upstream-Status: Pending
19 18---
20 lib/log/log.c | 6 ++++++ 19 lib/log/log.c | 6 ++++++
21 tools/lvmcmdline.c | 6 +++--- 20 tools/lvmcmdline.c | 6 +++---
22 2 files changed, 9 insertions(+), 3 deletions(-) 21 2 files changed, 9 insertions(+), 3 deletions(-)
23 22
24Index: LVM2.2.02.177/lib/log/log.c 23diff --git a/lib/log/log.c b/lib/log/log.c
25=================================================================== 24index 90905e629..ed69662d0 100644
26--- LVM2.2.02.177.orig/lib/log/log.c 25--- a/lib/log/log.c
27+++ LVM2.2.02.177/lib/log/log.c 26+++ b/lib/log/log.c
28@@ -161,6 +161,7 @@ static void _check_and_replace_standard_ 27@@ -165,6 +165,7 @@ static void _check_and_replace_standard_log_streams(FILE *old_stream, FILE *new_
29 * Close and reopen standard stream on file descriptor fd. 28 * Close and reopen standard stream on file descriptor fd.
30 */ 29 */
31 int reopen_standard_stream(FILE **stream, const char *mode) 30 int reopen_standard_stream(FILE **stream, const char *mode)
@@ -33,7 +32,7 @@ Index: LVM2.2.02.177/lib/log/log.c
33 { 32 {
34 int fd, fd_copy, new_fd; 33 int fd, fd_copy, new_fd;
35 const char *name; 34 const char *name;
36@@ -207,6 +208,11 @@ int reopen_standard_stream(FILE **stream 35@@ -211,6 +212,11 @@ int reopen_standard_stream(FILE **stream, const char *mode)
37 *stream = new_stream; 36 *stream = new_stream;
38 return 1; 37 return 1;
39 } 38 }
@@ -45,11 +44,11 @@ Index: LVM2.2.02.177/lib/log/log.c
45 44
46 void init_log_fn(lvm2_log_fn_t log_fn) 45 void init_log_fn(lvm2_log_fn_t log_fn)
47 { 46 {
48Index: LVM2.2.02.177/tools/lvmcmdline.c 47diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
49=================================================================== 48index 22ae1e3bb..b0928bc04 100644
50--- LVM2.2.02.177.orig/tools/lvmcmdline.c 49--- a/tools/lvmcmdline.c
51+++ LVM2.2.02.177/tools/lvmcmdline.c 50+++ b/tools/lvmcmdline.c
52@@ -3095,7 +3095,7 @@ static int _check_standard_fds(void) 51@@ -3407,7 +3407,7 @@ static int _check_standard_fds(void)
53 int err = is_valid_fd(STDERR_FILENO); 52 int err = is_valid_fd(STDERR_FILENO);
54 53
55 if (!is_valid_fd(STDIN_FILENO) && 54 if (!is_valid_fd(STDIN_FILENO) &&
@@ -58,7 +57,7 @@ Index: LVM2.2.02.177/tools/lvmcmdline.c
58 if (err) 57 if (err)
59 perror("stdin stream open"); 58 perror("stdin stream open");
60 else 59 else
61@@ -3105,7 +3105,7 @@ static int _check_standard_fds(void) 60@@ -3417,7 +3417,7 @@ static int _check_standard_fds(void)
62 } 61 }
63 62
64 if (!is_valid_fd(STDOUT_FILENO) && 63 if (!is_valid_fd(STDOUT_FILENO) &&
@@ -67,7 +66,7 @@ Index: LVM2.2.02.177/tools/lvmcmdline.c
67 if (err) 66 if (err)
68 perror("stdout stream open"); 67 perror("stdout stream open");
69 /* else no stdout */ 68 /* else no stdout */
70@@ -3113,7 +3113,7 @@ static int _check_standard_fds(void) 69@@ -3425,7 +3425,7 @@ static int _check_standard_fds(void)
71 } 70 }
72 71
73 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 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 @@
1From 1b9677f40ac547ba19d1cdbfd700901eab0a0d0b 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,17 +16,14 @@ 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 1422f5d05..8215811bd 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@@ -25,6 +25,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>
28 #include <fcntl.h> 28 #include <fcntl.h>
29 #include <unistd.h> 29 #include <unistd.h>
30--
312.44.0
32
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 @@
1From 3bba45890985b877b823836e78a1c8ac3c878856 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 4/4] tweak MODPROBE_CMD for cross compile 4Subject: [PATCH] tweak MODPROBE_CMD for cross compile
5 5
6Lvm uses variable MODPROBE_CMD at runtime, so build time detection of modprobe 6Lvm uses variable MODPROBE_CMD at runtime, so build time detection of modprobe
7is incorrect. 7is incorrect.
@@ -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 b43d8b9be..efe3062c1 100644 24index e5e5e71ce..3af73c781 100644
25--- a/configure.ac 25--- a/configure.ac
26+++ b/configure.ac 26+++ b/configure.ac
27@@ -1646,8 +1646,6 @@ AS_IF([test "$BUILD_DMFILEMAPD" = "yes"], [ 27@@ -1742,8 +1742,6 @@ AS_IF([test "$BUILD_DMFILEMAPD" = "yes"], [
28 ]) 28 ])
29 29
30 ################################################################################ 30 ################################################################################
@@ -33,6 +33,3 @@ index b43d8b9be..efe3062c1 100644
33 AS_IF([test -n "$MODPROBE_CMD"], [ 33 AS_IF([test -n "$MODPROBE_CMD"], [
34 AC_DEFINE_UNQUOTED([MODPROBE_CMD], ["$MODPROBE_CMD"], [The path to 'modprobe', if available.]) 34 AC_DEFINE_UNQUOTED([MODPROBE_CMD], ["$MODPROBE_CMD"], [The path to 'modprobe', if available.])
35 ]) 35 ])
36--
372.7.4
38
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 @@
1From 103ac1c1200df8190372d973e004776cffe8e659 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 2/3] do not build manual 4Subject: [PATCH] do not build manual
5 5
6On some host (ubuntu 1404), build manual failed. 6On some host (ubuntu 1404), build manual failed.
7... 7...
@@ -26,7 +26,7 @@ Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
26 2 files changed, 3 insertions(+), 4 deletions(-) 26 2 files changed, 3 insertions(+), 4 deletions(-)
27 27
28diff --git a/Makefile.in b/Makefile.in 28diff --git a/Makefile.in b/Makefile.in
29index 3b7e0ec..37f14eb 100644 29index 06c4b1823..90df7b09c 100644
30--- a/Makefile.in 30--- a/Makefile.in
31+++ b/Makefile.in 31+++ b/Makefile.in
32@@ -18,7 +18,7 @@ top_builddir = @top_builddir@ 32@@ -18,7 +18,7 @@ top_builddir = @top_builddir@
@@ -47,7 +47,7 @@ index 3b7e0ec..37f14eb 100644
47 libdaemon lib tools daemons libdm \ 47 libdaemon lib tools daemons libdm \
48 udev po 48 udev po
49 tools.distclean: test.distclean 49 tools.distclean: test.distclean
50@@ -59,7 +59,7 @@ unit-test run-unit-test: test 50@@ -59,7 +59,7 @@ unit-test run-unit-test: test libdm
51 51
52 daemons.device-mapper: libdm.device-mapper 52 daemons.device-mapper: libdm.device-mapper
53 tools.device-mapper: libdm.device-mapper 53 tools.device-mapper: libdm.device-mapper
@@ -57,10 +57,10 @@ index 3b7e0ec..37f14eb 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 6def519..18a5c97 100644 60index 3af73c781..f32d1f376 100644
61--- a/configure.ac 61--- a/configure.ac
62+++ b/configure.ac 62+++ b/configure.ac
63@@ -2018,7 +2018,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
@@ -68,6 +68,3 @@ index 6def519..18a5c97 100644
68 po/Makefile 68 po/Makefile
69 scripts/lvm2-pvscan.service 69 scripts/lvm2-pvscan.service
70 scripts/blkdeactivate.sh 70 scripts/blkdeactivate.sh
71--
722.25.1
73
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 @@
1From e213ed33a28704f6f538df41a91b7ce95594a4f8 Mon Sep 17 00:00:00 2001 1From 20a110ade91c73f4cb3883a3a9676708a93ca786 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Tue, 15 Oct 2019 18:12:54 +0800 3Date: Tue, 15 Oct 2019 18:12:54 +0800
4Subject: [PATCH] start lvm2-monitor.service after tmp.mount 4Subject: [PATCH] start lvm2-monitor.service after tmp.mount
@@ -19,7 +19,7 @@ Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
19 1 file changed, 1 insertion(+), 1 deletion(-) 19 1 file changed, 1 insertion(+), 1 deletion(-)
20 20
21diff --git a/scripts/lvm2_monitoring_systemd_red_hat.service.in b/scripts/lvm2_monitoring_systemd_red_hat.service.in 21diff --git a/scripts/lvm2_monitoring_systemd_red_hat.service.in b/scripts/lvm2_monitoring_systemd_red_hat.service.in
22index c0c96e3..2a99a37 100644 22index c0c96e316..2a99a379d 100644
23--- a/scripts/lvm2_monitoring_systemd_red_hat.service.in 23--- a/scripts/lvm2_monitoring_systemd_red_hat.service.in
24+++ b/scripts/lvm2_monitoring_systemd_red_hat.service.in 24+++ b/scripts/lvm2_monitoring_systemd_red_hat.service.in
25@@ -2,7 +2,7 @@ 25@@ -2,7 +2,7 @@
@@ -31,6 +31,3 @@ index c0c96e3..2a99a37 100644
31 Before=local-fs-pre.target shutdown.target 31 Before=local-fs-pre.target shutdown.target
32 DefaultDependencies=no 32 DefaultDependencies=no
33 Conflicts=shutdown.target 33 Conflicts=shutdown.target
34--
352.25.1
36
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 @@
1configure.ac: override CONFIGURE_LINE 1From f5c6fabbdf2e7bfa105658b9dfe45d2ab86f34bb Mon Sep 17 00:00:00 2001
2From: Joe Slater <joe.slater@windriver.com>
3Date: Fri, 17 Jul 2020 13:59:56 -0700
4Subject: [PATCH] configure.ac: override CONFIGURE_LINE
2 5
3For reproducible binaries, we need to report a constant CONFIGURE_LINE. 6For reproducible binaries, we need to report a constant CONFIGURE_LINE.
4 7
5Upstream-Status: Pending 8Upstream-Status: Pending
6 9
7Signed-off-by: Joe Slater <joe.slater@windriver.com> 10Signed-off-by: Joe Slater <joe.slater@windriver.com>
11---
12 configure.ac | 10 +++++++++-
13 1 file changed, 9 insertions(+), 1 deletion(-)
8 14
9 15diff --git a/configure.ac b/configure.ac
10--- git.orig/configure.ac 16index 5364dd68e..c2dbf3c9f 100644
11+++ git/configure.ac 17--- a/configure.ac
18+++ b/configure.ac
12@@ -15,7 +15,15 @@ AC_PREREQ(2.69) 19@@ -15,7 +15,15 @@ AC_PREREQ(2.69)
13 ################################################################################ 20 ################################################################################
14 dnl -- Process this file with autoconf to produce a configure script. 21 dnl -- Process this file with autoconf to produce a configure script.
diff --git a/meta-oe/recipes-support/lvm2/libdevmapper_2.03.22.bb b/meta-oe/recipes-support/lvm2/libdevmapper.bb
index be558ce1d2..3b4439c3ae 100644
--- a/meta-oe/recipes-support/lvm2/libdevmapper_2.03.22.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_2.03.22.bb b/meta-oe/recipes-support/lvm2/lvm2.bb
index c675d3ded8..f569424e27 100644
--- a/meta-oe/recipes-support/lvm2/lvm2_2.03.22.bb
+++ b/meta-oe/recipes-support/lvm2/lvm2.bb
@@ -1,9 +1,7 @@
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 file://0001-lvmdbusd-create-dirs-for-lock-file.patch \
7 " 5 "
8 6
9DEPENDS += "autoconf-archive-native" 7DEPENDS += "autoconf-archive-native"
@@ -17,7 +15,7 @@ CACHED_CONFIGUREVARS += "MODPROBE_CMD=${base_sbindir}/modprobe"
17do_install:append() { 15do_install:append() {
18 # Install machine specific configuration file 16 # Install machine specific configuration file
19 install -d ${D}${sysconfdir}/lvm 17 install -d ${D}${sysconfdir}/lvm
20 install -m 0644 ${WORKDIR}/lvm.conf ${D}${sysconfdir}/lvm/lvm.conf 18 install -m 0644 ${UNPACKDIR}/lvm.conf ${D}${sysconfdir}/lvm/lvm.conf
21 sed -i -e 's:@libdir@:${libdir}:g' ${D}${sysconfdir}/lvm/lvm.conf 19 sed -i -e 's:@libdir@:${libdir}:g' ${D}${sysconfdir}/lvm/lvm.conf
22 # We don't want init scripts/systemd units for native SDK utilities 20 # We don't want init scripts/systemd units for native SDK utilities
23 if [ "${PN}" != "nativesdk-lvm2" ]; then 21 if [ "${PN}" != "nativesdk-lvm2" ]; then
@@ -39,7 +37,7 @@ do_install:append() {
39 || true 37 || true
40} 38}
41 39
42PACKAGE_BEFORE_PN = "${PN}-scripts ${PN}-udevrules" 40PACKAGE_BEFORE_PN = "${PN}-scripts"
43 41
44SYSTEMD_PACKAGES = "${PN}" 42SYSTEMD_PACKAGES = "${PN}"
45SYSTEMD_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)} \
@@ -58,21 +56,30 @@ LVM2_PACKAGECONFIG:append:class-target = " \
58" 56"
59 57
60PACKAGECONFIG[dbus] = "--enable-dbus-service,--disable-dbus-service,,python3-dbus python3-pyudev" 58PACKAGECONFIG[dbus] = "--enable-dbus-service,--disable-dbus-service,,python3-dbus python3-pyudev"
61PACKAGECONFIG[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,"
62 60
63PACKAGES =+ "libdevmapper" 61PACKAGES =+ "libdevmapper"
64FILES:libdevmapper = " \ 62FILES:libdevmapper = " \
65 ${libdir}/libdevmapper.so.* \ 63 ${libdir}/libdevmapper.so.* \
66 ${sbindir}/dmsetup \ 64 ${sbindir}/dmsetup \
67 ${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 \
68" 69"
69 70
70FILES:${PN} += " \ 71FILES:${PN} += " \
71 ${libdir}/device-mapper/*.so \ 72 ${libdir}/device-mapper/*.so \
72 ${systemd_system_unitdir}/lvm2-pvscan@.service \ 73 ${systemd_system_unitdir} \
73 ${PYTHON_SITEPACKAGES_DIR}/lvmdbusd \ 74 ${PYTHON_SITEPACKAGES_DIR}/lvmdbusd \
74 ${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 \
75" 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"
76 83
77FILES:${PN}-scripts = " \ 84FILES:${PN}-scripts = " \
78 ${sbindir}/blkdeactivate \ 85 ${sbindir}/blkdeactivate \
@@ -80,11 +87,8 @@ FILES:${PN}-scripts = " \
80 ${sbindir}/lvmconf \ 87 ${sbindir}/lvmconf \
81 ${sbindir}/lvmdump \ 88 ${sbindir}/lvmdump \
82" 89"
83# Specified explicitly for the udev rules, just in case that it does not get picked 90
84# up automatically:
85FILES:${PN}-udevrules = "${nonarch_base_libdir}/udev/rules.d"
86RDEPENDS:${PN} = "bash" 91RDEPENDS:${PN} = "bash"
87RDEPENDS:${PN}-udevrules = "libdevmapper"
88RDEPENDS:${PN}:append:class-target = " libdevmapper" 92RDEPENDS:${PN}:append:class-target = " libdevmapper"
89RDEPENDS:${PN}:append:class-nativesdk = " libdevmapper" 93RDEPENDS:${PN}:append:class-nativesdk = " libdevmapper"
90 94
diff --git a/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-oe/recipes-support/lvm2/lvm2.inc
index d95366f97e..0ff17aed5c 100644
--- a/meta-oe/recipes-support/lvm2/lvm2.inc
+++ b/meta-oe/recipes-support/lvm2/lvm2.inc
@@ -15,17 +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 = "016e469caf856f1eb8dde39df0d1aa2e74225aed" 21SRCREV = "8817523c5682a7fd83770d3f58a99c436f7e73f7"
23S = "${WORKDIR}/git" 22PV = "2.03.32"
24 23
25UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\_\d+)+)" 24UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\_\d+)+)"
26 25
27inherit autotools-brokensep pkgconfig systemd 26inherit autotools-brokensep pkgconfig systemd
28 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
29LVM2_PACKAGECONFIG = "dmeventd" 51LVM2_PACKAGECONFIG = "dmeventd"
30LVM2_PACKAGECONFIG:append:class-target = " \ 52LVM2_PACKAGECONFIG:append:class-target = " \
31 ${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)} \ 53 ${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)} \
@@ -58,7 +80,3 @@ EXTRA_OECONF = "--with-user= \
58 --with-thin-repair=${sbindir}/thin_repair \ 80 --with-thin-repair=${sbindir}/thin_repair \
59 --with-thin-restore=${sbindir}/thin_restore \ 81 --with-thin-restore=${sbindir}/thin_restore \
60" 82"
61
62# 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
63# after it was uncommented in the later in 2.03.12 with https://github.com/lvmteam/lvm2/commit/60eb608d66c2056a78e81f27db3da14139d9faab
64LDFLAGS: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 c0cf836ce8..0000000000
--- a/meta-oe/recipes-support/lvm2/lvm2/0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch
+++ /dev/null
@@ -1,73 +0,0 @@
1From ddf36613f3408ce42f15b03b4e9c6ad8478b97f8 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 991a0cf85..e59c82472 100644
19--- a/configure.ac
20+++ b/configure.ac
21@@ -1660,6 +1660,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@@ -1886,6 +1888,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.
71--
722.29.2
73
diff --git a/meta-oe/recipes-support/lvm2/lvm2/0001-lvmdbusd-create-dirs-for-lock-file.patch b/meta-oe/recipes-support/lvm2/lvm2/0001-lvmdbusd-create-dirs-for-lock-file.patch
deleted file mode 100644
index f6b293553d..0000000000
--- a/meta-oe/recipes-support/lvm2/lvm2/0001-lvmdbusd-create-dirs-for-lock-file.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1lvmdbusd: create dirs for lock file
2
3Create leading dirs for lvmdbusd lock file, otherwise it fails to start:
4
5| systemd[1]: Starting LVM2 D-Bus service...
6| lvmdbusd[1602]: [1602]: Error during creation of lock file(/var/lock/lvm/lvmdbusd): errno(2), exiting!
7
8Upstream-Status: Submitted [https://gitlab.com/lvmteam/lvm2/-/merge_requests/7]
9
10Signed-off-by: Kai Kang <kai.kang@windriver.com>
11---
12 daemons/lvmdbusd/utils.py | 1 +
13 1 file changed, 1 insertion(+)
14
15diff --git a/daemons/lvmdbusd/utils.py b/daemons/lvmdbusd/utils.py
16index d479175f6..830648659 100644
17--- a/daemons/lvmdbusd/utils.py
18+++ b/daemons/lvmdbusd/utils.py
19@@ -778,6 +778,7 @@ class LockFile(object):
20
21 def __enter__(self):
22 try:
23+ os.makedirs(os.path.dirname(self.lock_file))
24 self.fd = os.open(self.lock_file, os.O_CREAT | os.O_RDWR, stat.S_IRUSR | stat.S_IWUSR)
25
26 # Get and set the close on exec and lock the file
27--
282.34.1
29
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 3b85a17b61..200f2f044a 100644
--- a/meta-oe/recipes-support/lvm2/lvm2/tweak-for-lvmdbusd.patch
+++ b/meta-oe/recipes-support/lvm2/lvm2/tweak-for-lvmdbusd.patch
@@ -1,3 +1,8 @@
1From 34f5a21afae759d48fa11e77b622ca35a4feabaa 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] lvm2: 2.03.16 -> 2.03.22
5
1Not check python modules pyudev and dbus during configure that they are runtime 6Not check python modules pyudev and dbus during configure that they are runtime
2dependencies. Deal with them in the package config setting in the recipe. 7dependencies. Deal with them in the package config setting in the recipe.
3 8
@@ -13,10 +18,10 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com>
13 2 files changed, 4 insertions(+), 6 deletions(-) 18 2 files changed, 4 insertions(+), 6 deletions(-)
14 19
15diff --git a/configure.ac b/configure.ac 20diff --git a/configure.ac b/configure.ac
16index ee088b3f5..b94ef4e56 100644 21index 9dfdcfe01..fcf5c8b78 100644
17--- a/configure.ac 22--- a/configure.ac
18+++ b/configure.ac 23+++ b/configure.ac
19@@ -1262,8 +1262,8 @@ AS_IF([test "$BUILD_LVMDBUSD" = "yes"], [ 24@@ -1282,8 +1282,8 @@ AS_IF([test "$BUILD_LVMDBUSD" = "yes"], [
20 AS_IF([test "$PYTHON3_BINDINGS" = "yes"], [PYTHON_BINDINGS="yes"]) 25 AS_IF([test "$PYTHON3_BINDINGS" = "yes"], [PYTHON_BINDINGS="yes"])
21 26
22 # To get this macro, install autoconf-archive package then run autoreconf 27 # To get this macro, install autoconf-archive package then run autoreconf
@@ -28,7 +33,7 @@ index ee088b3f5..b94ef4e56 100644
28 33
29 ################################################################################ 34 ################################################################################
30diff --git a/daemons/lvmdbusd/Makefile.in b/daemons/lvmdbusd/Makefile.in 35diff --git a/daemons/lvmdbusd/Makefile.in b/daemons/lvmdbusd/Makefile.in
31index 9c2629279..a79daabf7 100644 36index 08b061fb2..e2b1c3209 100644
32--- a/daemons/lvmdbusd/Makefile.in 37--- a/daemons/lvmdbusd/Makefile.in
33+++ b/daemons/lvmdbusd/Makefile.in 38+++ b/daemons/lvmdbusd/Makefile.in
34@@ -16,7 +16,7 @@ top_srcdir = @top_srcdir@ 39@@ -16,7 +16,7 @@ top_srcdir = @top_srcdir@
@@ -41,7 +46,7 @@ index 9c2629279..a79daabf7 100644
41 LVMDBUS_SRCDIR_FILES = \ 46 LVMDBUS_SRCDIR_FILES = \
42 automatedproperties.py \ 47 automatedproperties.py \
43@@ -55,11 +55,9 @@ install_lvmdbusd: $(LVMDBUSD) 48@@ -55,11 +55,9 @@ install_lvmdbusd: $(LVMDBUSD)
44 @echo " [INSTALL] $<" 49 $(SHOW) " [INSTALL] $<"
45 $(Q) $(INSTALL_DIR) $(sbindir) 50 $(Q) $(INSTALL_DIR) $(sbindir)
46 $(Q) $(INSTALL_SCRIPT) $(LVMDBUSD) $(sbindir) 51 $(Q) $(INSTALL_SCRIPT) $(LVMDBUSD) $(sbindir)
47- $(Q) $(INSTALL_DIR) $(lvmdbusdir) $(lvmdbusdir)/__pycache__ 52- $(Q) $(INSTALL_DIR) $(lvmdbusdir) $(lvmdbusdir)/__pycache__
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-07-08 21:00:23 +0000