mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-04 14:39:54 +00:00
Code Issues Projects Releases Wiki Activity

lvm2: remove subitted patch

Browse Source 
devmapper update also updated lvm2. Thus build fails with:
patching file daemons/lvmdbusd/utils.py
Hunk #1 FAILED at 778.
1 out of 1 hunk FAILED -- rejects in file daemons/lvmdbusd/utils.py

- Drop the submitted patch
- Move PV to lvm2.inc to ensure we keep it in sync for libdevmapper and lvm2
- refresh patches

Signed-off-by: Markus Volk <f_l_k@t-online.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Markus Volk
2024-05-28 10:18:07 +02:00
committed by Khem Raj
parent 1e5179077a
commit cc4e9fbd82
14 changed files with 67 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch
+7 -10
View File
@@ -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> From: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Date: Mon, 26 Nov 2018 14:53:09 +0800 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 Upstream-Status: Inappropriate
@@ -19,7 +19,7 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
5 files changed, 10 insertions(+), 10 deletions(-) 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 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 --- a/scripts/blk_availability_init_red_hat.in
+++ b/scripts/blk_availability_init_red_hat.in +++ b/scripts/blk_availability_init_red_hat.in
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
@@ -37,7 +37,7 @@ index 347c395..b2e9cf9 100644
;; ;;
esac esac
diff --git a/scripts/cmirrord_init_red_hat.in b/scripts/cmirrord_init_red_hat.in 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 --- a/scripts/cmirrord_init_red_hat.in
+++ b/scripts/cmirrord_init_red_hat.in +++ b/scripts/cmirrord_init_red_hat.in
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
@@ -56,7 +56,7 @@ index c82f8f5..a3a321d 100755
esac esac
diff --git a/scripts/lvm2_lvmpolld_init_red_hat.in b/scripts/lvm2_lvmpolld_init_red_hat.in 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 --- a/scripts/lvm2_lvmpolld_init_red_hat.in
+++ b/scripts/lvm2_lvmpolld_init_red_hat.in +++ b/scripts/lvm2_lvmpolld_init_red_hat.in
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
@@ -75,7 +75,7 @@ index 176ff5d..825f6ad 100644
esac esac
diff --git a/scripts/lvm2_monitoring_init_red_hat.in b/scripts/lvm2_monitoring_init_red_hat.in 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 --- a/scripts/lvm2_monitoring_init_red_hat.in
+++ b/scripts/lvm2_monitoring_init_red_hat.in +++ b/scripts/lvm2_monitoring_init_red_hat.in
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
@@ -94,7 +94,7 @@ index 95e4125..dff89cd 100644
esac esac
diff --git a/scripts/lvm2_monitoring_init_rhel4 b/scripts/lvm2_monitoring_init_rhel4 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 --- a/scripts/lvm2_monitoring_init_rhel4
+++ b/scripts/lvm2_monitoring_init_rhel4 +++ b/scripts/lvm2_monitoring_init_rhel4
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
@@ -112,6 +112,3 @@ index 8eb06c5..2e8d0f7 100644
;; ;;
esac esac
--
2.7.4
meta-oe/recipes-support/lvm2/files/0001-configure.ac-check-egrep.patch
+6 -6
View File
@@ -1,4 +1,7 @@
configure.ac: check egrep 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 The macro AC_HEADER_STDC which requires AC_PROG_EGREP has been removed
from configure.ac, then it fails to substitute '@EGREP@': from configure.ac, then it fails to substitute '@EGREP@':
@@ -17,10 +20,10 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com>
1 file changed, 1 insertion(+) 1 file changed, 1 insertion(+)
diff --git a/configure.ac b/configure.ac diff --git a/configure.ac b/configure.ac
index 2e52498f9..d9462e22c 100644 index c2dbf3c9f..d9e7964c3 100644
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -78,6 +78,7 @@ AC_PROG_LN_S @@ -88,6 +88,7 @@ AC_PROG_EGREP
AC_PROG_MAKE_SET AC_PROG_MAKE_SET
AC_PROG_MKDIR_P AC_PROG_MKDIR_P
AC_PROG_RANLIB AC_PROG_RANLIB
@@ -28,6 +31,3 @@ index 2e52498f9..d9462e22c 100644
AC_CHECK_TOOL([READELF], [readelf]) AC_CHECK_TOOL([READELF], [readelf])
AC_CHECK_TOOL(AR, ar) AC_CHECK_TOOL(AR, ar)
AC_PATH_TOOL(CFLOW_CMD, cflow) AC_PATH_TOOL(CFLOW_CMD, cflow)
--
2.34.1
meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch
+14 -17
View File
@@ -1,4 +1,4 @@
From e3103459416616d3b8508e7176e897b0ae6c90f2 Mon Sep 17 00:00:00 2001 From a86919ed5468f3c152114446c189b00f5f656d59 Mon Sep 17 00:00:00 2001
From: Dengke Du <dengke.du@windriver.com> From: Dengke Du <dengke.du@windriver.com>
Date: Tue, 25 Oct 2016 11:49:40 +0000 Date: Tue, 25 Oct 2016 11:49:40 +0000
Subject: [PATCH] implement libc specific reopen_stream Subject: [PATCH] implement libc specific reopen_stream
@@ -13,19 +13,16 @@ 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: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Dengke Du <dengke.du@windriver.com> Signed-off-by: Dengke Du <dengke.du@windriver.com>
--- ---
Upstream-Status: Pending
lib/log/log.c | 6 ++++++ lib/log/log.c | 6 ++++++
tools/lvmcmdline.c | 6 +++--- tools/lvmcmdline.c | 6 +++---
2 files changed, 9 insertions(+), 3 deletions(-) 2 files changed, 9 insertions(+), 3 deletions(-)
Index: LVM2.2.02.177/lib/log/log.c diff --git a/lib/log/log.c b/lib/log/log.c
=================================================================== index 7b88252f0..e1720098a 100644
--- LVM2.2.02.177.orig/lib/log/log.c --- a/lib/log/log.c
+++ LVM2.2.02.177/lib/log/log.c +++ b/lib/log/log.c
@@ -161,6 +161,7 @@ static void _check_and_replace_standard_ @@ -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. * Close and reopen standard stream on file descriptor fd.
*/ */
int reopen_standard_stream(FILE **stream, const char *mode) int reopen_standard_stream(FILE **stream, const char *mode)
@@ -33,7 +30,7 @@ Index: LVM2.2.02.177/lib/log/log.c
{ {
int fd, fd_copy, new_fd; int fd, fd_copy, new_fd;
const char *name; 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; *stream = new_stream;
return 1; return 1;
} }
@@ -45,11 +42,11 @@ Index: LVM2.2.02.177/lib/log/log.c
void init_log_fn(lvm2_log_fn_t log_fn) void init_log_fn(lvm2_log_fn_t log_fn)
{ {
Index: LVM2.2.02.177/tools/lvmcmdline.c diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
=================================================================== index 3fd23a521..c2ee39905 100644
--- LVM2.2.02.177.orig/tools/lvmcmdline.c --- a/tools/lvmcmdline.c
+++ LVM2.2.02.177/tools/lvmcmdline.c +++ b/tools/lvmcmdline.c
@@ -3095,7 +3095,7 @@ static int _check_standard_fds(void) @@ -3380,7 +3380,7 @@ static int _check_standard_fds(void)
int err = is_valid_fd(STDERR_FILENO); int err = is_valid_fd(STDERR_FILENO);
if (!is_valid_fd(STDIN_FILENO) && if (!is_valid_fd(STDIN_FILENO) &&
@@ -58,7 +55,7 @@ Index: LVM2.2.02.177/tools/lvmcmdline.c
if (err) if (err)
perror("stdin stream open"); perror("stdin stream open");
else else
@@ -3105,7 +3105,7 @@ static int _check_standard_fds(void) @@ -3390,7 +3390,7 @@ static int _check_standard_fds(void)
} }
if (!is_valid_fd(STDOUT_FILENO) && if (!is_valid_fd(STDOUT_FILENO) &&
@@ -67,7 +64,7 @@ Index: LVM2.2.02.177/tools/lvmcmdline.c
if (err) if (err)
perror("stdout stream open"); perror("stdout stream open");
/* else no stdout */ /* else no stdout */
@@ -3113,7 +3113,7 @@ static int _check_standard_fds(void) @@ -3398,7 +3398,7 @@ static int _check_standard_fds(void)
} }
if (!is_valid_fd(STDERR_FILENO) && if (!is_valid_fd(STDERR_FILENO) &&
meta-oe/recipes-support/lvm2/files/0001-include-libgen.h-for-basename.patch
+3 -6
View File
@@ -1,4 +1,4 @@
From 1b9677f40ac547ba19d1cdbfd700901eab0a0d0b Mon Sep 17 00:00:00 2001 From 4e7f4ea0bf89726255612a2a382c064e5923fbcd Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com> From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 25 Mar 2024 13:07:28 -0700 Date: Mon, 25 Mar 2024 13:07:28 -0700
Subject: [PATCH] include libgen.h for basename Subject: [PATCH] include libgen.h for basename
@@ -16,10 +16,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
1 file changed, 1 insertion(+) 1 file changed, 1 insertion(+)
diff --git a/lib/device/device_id.c b/lib/device/device_id.c diff --git a/lib/device/device_id.c b/lib/device/device_id.c
index 1422f5d05..8215811bd 100644 index 2b183810a..53467cbbb 100644
--- a/lib/device/device_id.c --- a/lib/device/device_id.c
+++ b/lib/device/device_id.c +++ b/lib/device/device_id.c
@@ -25,6 +25,7 @@ @@ -26,6 +26,7 @@
#include "lib/datastruct/str_list.h" #include "lib/datastruct/str_list.h"
#include "lib/metadata/metadata-exported.h" #include "lib/metadata/metadata-exported.h"
@@ -27,6 +27,3 @@ index 1422f5d05..8215811bd 100644
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h> #include <unistd.h>
--
2.44.0
meta-oe/recipes-support/lvm2/files/0004-tweak-MODPROBE_CMD-for-cross-compile.patch
+4 -7
View File
@@ -1,7 +1,7 @@
From 3bba45890985b877b823836e78a1c8ac3c878856 Mon Sep 17 00:00:00 2001 From b30f842d5d200a8217a47465d6cdd99d3805ba76 Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@windriver.com> From: Hongxu Jia <hongxu.jia@windriver.com>
Date: Tue, 31 Jul 2018 15:04:29 +0800 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 Lvm uses variable MODPROBE_CMD at runtime, so build time detection of modprobe
is incorrect. is incorrect.
@@ -21,10 +21,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
1 file changed, 2 deletions(-) 1 file changed, 2 deletions(-)
diff --git a/configure.ac b/configure.ac diff --git a/configure.ac b/configure.ac
index b43d8b9be..efe3062c1 100644 index c8d81e16c..7c1c04627 100644
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -1646,8 +1646,6 @@ AS_IF([test "$BUILD_DMFILEMAPD" = "yes"], [ @@ -1689,8 +1689,6 @@ AS_IF([test "$BUILD_DMFILEMAPD" = "yes"], [
]) ])
################################################################################ ################################################################################
@@ -33,6 +33,3 @@ index b43d8b9be..efe3062c1 100644
AS_IF([test -n "$MODPROBE_CMD"], [ AS_IF([test -n "$MODPROBE_CMD"], [
AC_DEFINE_UNQUOTED([MODPROBE_CMD], ["$MODPROBE_CMD"], [The path to 'modprobe', if available.]) AC_DEFINE_UNQUOTED([MODPROBE_CMD], ["$MODPROBE_CMD"], [The path to 'modprobe', if available.])
]) ])
--
2.7.4
meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch
+6 -9
View File
@@ -1,7 +1,7 @@
From 103ac1c1200df8190372d973e004776cffe8e659 Mon Sep 17 00:00:00 2001 From e0e06b77e067da6a01dd9b0d5582a0a1709c655d Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@windriver.com> From: Hongxu Jia <hongxu.jia@windriver.com>
Date: Mon, 26 Nov 2018 14:59:55 +0800 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. 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(-) 2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/Makefile.in b/Makefile.in diff --git a/Makefile.in b/Makefile.in
index 3b7e0ec..37f14eb 100644 index 06c4b1823..90df7b09c 100644
--- a/Makefile.in --- a/Makefile.in
+++ b/Makefile.in +++ b/Makefile.in
@@ -18,7 +18,7 @@ top_builddir = @top_builddir@ @@ -18,7 +18,7 @@ top_builddir = @top_builddir@
@@ -47,7 +47,7 @@ index 3b7e0ec..37f14eb 100644
libdaemon lib tools daemons libdm \ libdaemon lib tools daemons libdm \
udev po udev po
tools.distclean: test.distclean 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 daemons.device-mapper: libdm.device-mapper
tools.device-mapper: libdm.device-mapper tools.device-mapper: libdm.device-mapper
@@ -57,10 +57,10 @@ index 3b7e0ec..37f14eb 100644
ifeq ("@INTL@", "yes") ifeq ("@INTL@", "yes")
diff --git a/configure.ac b/configure.ac diff --git a/configure.ac b/configure.ac
index 6def519..18a5c97 100644 index 7c1c04627..5364dd68e 100644
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -2018,7 +2018,6 @@ libdaemon/server/Makefile @@ -2022,7 +2022,6 @@ libdaemon/server/Makefile
libdm/Makefile libdm/Makefile
libdm/dm-tools/Makefile libdm/dm-tools/Makefile
libdm/libdevmapper.pc libdm/libdevmapper.pc
@@ -68,6 +68,3 @@ index 6def519..18a5c97 100644
po/Makefile po/Makefile
scripts/lvm2-pvscan.service scripts/lvm2-pvscan.service
scripts/blkdeactivate.sh scripts/blkdeactivate.sh
--
2.25.1
meta-oe/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch
+2 -5
View File
@@ -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> From: Hongxu Jia <hongxu.jia@windriver.com>
Date: Tue, 15 Oct 2019 18:12:54 +0800 Date: Tue, 15 Oct 2019 18:12:54 +0800
Subject: [PATCH] start lvm2-monitor.service after tmp.mount 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(-) 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 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 --- a/scripts/lvm2_monitoring_systemd_red_hat.service.in
+++ b/scripts/lvm2_monitoring_systemd_red_hat.service.in +++ b/scripts/lvm2_monitoring_systemd_red_hat.service.in
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
@@ -31,6 +31,3 @@ index c0c96e3..2a99a37 100644
Before=local-fs-pre.target shutdown.target Before=local-fs-pre.target shutdown.target
DefaultDependencies=no DefaultDependencies=no
Conflicts=shutdown.target Conflicts=shutdown.target
--
2.25.1
meta-oe/recipes-support/lvm2/files/reproducible-build.patch
+11 -4
View File
@@ -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. For reproducible binaries, we need to report a constant CONFIGURE_LINE.
Upstream-Status: Pending Upstream-Status: Pending
Signed-off-by: Joe Slater <joe.slater@windriver.com> Signed-off-by: Joe Slater <joe.slater@windriver.com>
---
configure.ac | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
--- git.orig/configure.ac index 5364dd68e..c2dbf3c9f 100644
+++ git/configure.ac --- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,15 @@ AC_PREREQ(2.69) @@ -15,7 +15,15 @@ AC_PREREQ(2.69)
################################################################################ ################################################################################
dnl -- Process this file with autoconf to produce a configure script. dnl -- Process this file with autoconf to produce a configure script.
meta-oe/recipes-support/lvm2/libdevmapper_2.03.24.bb → meta-oe/recipes-support/lvm2/libdevmapper.bb
View File
meta-oe/recipes-support/lvm2/lvm2_2.03.22.bb → meta-oe/recipes-support/lvm2/lvm2.bb
-1
View File
@@ -3,7 +3,6 @@ require lvm2.inc
SRC_URI += " \ SRC_URI += " \
file://0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch \ file://0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch \
file://tweak-for-lvmdbusd.patch \ file://tweak-for-lvmdbusd.patch \
file://0001-lvmdbusd-create-dirs-for-lock-file.patch \
" "
DEPENDS += "autoconf-archive-native" DEPENDS += "autoconf-archive-native"
meta-oe/recipes-support/lvm2/lvm2.inc
+1
View File
@@ -21,6 +21,7 @@ SRC_URI = "git://sourceware.org/git/lvm2.git;branch=main \
SRCREV = "90ec2cd92f6367c431dd8dae55d0cbe7e196734f" SRCREV = "90ec2cd92f6367c431dd8dae55d0cbe7e196734f"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
PV = "2.03.24"
UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\_\d+)+)" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\_\d+)+)"
meta-oe/recipes-support/lvm2/lvm2/0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch
+4 -7
View File
@@ -1,4 +1,4 @@
From ddf36613f3408ce42f15b03b4e9c6ad8478b97f8 Mon Sep 17 00:00:00 2001 From 2ff2a867db8d3e1c660d191a1805f9e355169c80 Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@windriver.com> From: Hongxu Jia <hongxu.jia@windriver.com>
Date: Tue, 2 Mar 2021 01:33:05 -0800 Date: Tue, 2 Mar 2021 01:33:05 -0800
Subject: [PATCH] fix command /bin/findmnt, /bin/lsblk, /bin/sort not found Subject: [PATCH] fix command /bin/findmnt, /bin/lsblk, /bin/sort not found
@@ -15,10 +15,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
2 files changed, 7 insertions(+), 3 deletions(-) 2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac diff --git a/configure.ac b/configure.ac
index 991a0cf85..e59c82472 100644 index d9e7964c3..9dfdcfe01 100644
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -1660,6 +1660,8 @@ AS_IF([test -n "$MODPROBE_CMD"], [ @@ -1704,6 +1704,8 @@ AS_IF([test -n "$MODPROBE_CMD"], [
SYSCONFDIR="$(eval echo $(eval echo $sysconfdir))" SYSCONFDIR="$(eval echo $(eval echo $sysconfdir))"
@@ -27,7 +27,7 @@ index 991a0cf85..e59c82472 100644
SBINDIR="$(eval echo $(eval echo $sbindir))" SBINDIR="$(eval echo $(eval echo $sbindir))"
LVM_PATH="$SBINDIR/lvm" LVM_PATH="$SBINDIR/lvm"
AC_DEFINE_UNQUOTED(LVM_PATH, ["$LVM_PATH"], [Path to lvm binary.]) AC_DEFINE_UNQUOTED(LVM_PATH, ["$LVM_PATH"], [Path to lvm binary.])
@@ -1886,6 +1888,7 @@ AC_SUBST(PYTHON2DIR) @@ -1944,6 +1946,7 @@ AC_SUBST(PYTHON2DIR)
AC_SUBST(PYTHON3) AC_SUBST(PYTHON3)
AC_SUBST(PYTHON3DIR) AC_SUBST(PYTHON3DIR)
AC_SUBST(RT_LIBS) AC_SUBST(RT_LIBS)
@@ -68,6 +68,3 @@ index 7c517b87b..7ef1bb766 100644
# Do not show tool errors by default (only done/skipping summary # Do not show tool errors by default (only done/skipping summary
# message provided by this script) and no verbose mode by default. # message provided by this script) and no verbose mode by default.
--
2.29.2
meta-oe/recipes-support/lvm2/lvm2/0001-lvmdbusd-create-dirs-for-lock-file.patch
-29
View File
@@ -1,29 +0,0 @@
lvmdbusd: create dirs for lock file
Create leading dirs for lvmdbusd lock file, otherwise it fails to start:
| systemd[1]: Starting LVM2 D-Bus service...
| lvmdbusd[1602]: [1602]: Error during creation of lock file(/var/lock/lvm/lvmdbusd): errno(2), exiting!
Upstream-Status: Submitted [https://gitlab.com/lvmteam/lvm2/-/merge_requests/7]
Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
daemons/lvmdbusd/utils.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/daemons/lvmdbusd/utils.py b/daemons/lvmdbusd/utils.py
index d479175f6..830648659 100644
--- a/daemons/lvmdbusd/utils.py
+++ b/daemons/lvmdbusd/utils.py
@@ -778,6 +778,7 @@ class LockFile(object):
def __enter__(self):
try:
+ os.makedirs(os.path.dirname(self.lock_file))
self.fd = os.open(self.lock_file, os.O_CREAT | os.O_RDWR, stat.S_IRUSR | stat.S_IWUSR)
# Get and set the close on exec and lock the file
--
2.34.1
meta-oe/recipes-support/lvm2/lvm2/tweak-for-lvmdbusd.patch
+9 -4
View File
@@ -1,3 +1,8 @@
From 34f5a21afae759d48fa11e77b622ca35a4feabaa 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] lvm2: 2.03.16 -> 2.03.22
Not check python modules pyudev and dbus during configure that they are runtime Not check python modules pyudev and dbus during configure that they are runtime
dependencies. Deal with them in the package config setting in the recipe. dependencies. Deal with them in the package config setting in the recipe.
@@ -13,10 +18,10 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com>
2 files changed, 4 insertions(+), 6 deletions(-) 2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/configure.ac b/configure.ac diff --git a/configure.ac b/configure.ac
index ee088b3f5..b94ef4e56 100644 index 9dfdcfe01..fcf5c8b78 100644
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -1262,8 +1262,8 @@ AS_IF([test "$BUILD_LVMDBUSD" = "yes"], [ @@ -1282,8 +1282,8 @@ AS_IF([test "$BUILD_LVMDBUSD" = "yes"], [
AS_IF([test "$PYTHON3_BINDINGS" = "yes"], [PYTHON_BINDINGS="yes"]) AS_IF([test "$PYTHON3_BINDINGS" = "yes"], [PYTHON_BINDINGS="yes"])
# To get this macro, install autoconf-archive package then run autoreconf # To get this macro, install autoconf-archive package then run autoreconf
@@ -28,7 +33,7 @@ index ee088b3f5..b94ef4e56 100644
################################################################################ ################################################################################
diff --git a/daemons/lvmdbusd/Makefile.in b/daemons/lvmdbusd/Makefile.in diff --git a/daemons/lvmdbusd/Makefile.in b/daemons/lvmdbusd/Makefile.in
index 9c2629279..a79daabf7 100644 index 08b061fb2..e2b1c3209 100644
--- a/daemons/lvmdbusd/Makefile.in --- a/daemons/lvmdbusd/Makefile.in
+++ b/daemons/lvmdbusd/Makefile.in +++ b/daemons/lvmdbusd/Makefile.in
@@ -16,7 +16,7 @@ top_srcdir = @top_srcdir@ @@ -16,7 +16,7 @@ top_srcdir = @top_srcdir@
@@ -41,7 +46,7 @@ index 9c2629279..a79daabf7 100644
LVMDBUS_SRCDIR_FILES = \ LVMDBUS_SRCDIR_FILES = \
automatedproperties.py \ automatedproperties.py \
@@ -55,11 +55,9 @@ install_lvmdbusd: $(LVMDBUSD) @@ -55,11 +55,9 @@ install_lvmdbusd: $(LVMDBUSD)
@echo " [INSTALL] $<" $(SHOW) " [INSTALL] $<"
$(Q) $(INSTALL_DIR) $(sbindir) $(Q) $(INSTALL_DIR) $(sbindir)
$(Q) $(INSTALL_SCRIPT) $(LVMDBUSD) $(sbindir) $(Q) $(INSTALL_SCRIPT) $(LVMDBUSD) $(sbindir)
- $(Q) $(INSTALL_DIR) $(lvmdbusdir) $(lvmdbusdir)/__pycache__ - $(Q) $(INSTALL_DIR) $(lvmdbusdir) $(lvmdbusdir)/__pycache__