From afa14207fe5dbf2c94373a65292cb608279b9241 Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Thu, 12 Sep 2024 10:45:53 +0800 Subject: lvm2: upgrade 2.03.25 -> 2.03.26 ChangeLog: https://gitlab.com/lvmteam/lvm2/-/tags/v2_03_26 Drop 0001-configure.ac-check-egrep.patch as the issue has been fixed upstream. Signed-off-by: Yi Zhao Signed-off-by: Khem Raj --- .../lvm2/files/0001-configure.ac-check-egrep.patch | 33 ---------------------- meta-oe/recipes-support/lvm2/lvm2.inc | 5 ++-- 2 files changed, 2 insertions(+), 36 deletions(-) delete mode 100644 meta-oe/recipes-support/lvm2/files/0001-configure.ac-check-egrep.patch 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 -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 ---- - 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/lvm2.inc b/meta-oe/recipes-support/lvm2/lvm2.inc index 3f90bf2788..059ab6999b 100644 --- a/meta-oe/recipes-support/lvm2/lvm2.inc +++ b/meta-oe/recipes-support/lvm2/lvm2.inc @@ -15,13 +15,12 @@ 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 = "0eef5ab6e14a45e6d2eacbc0bb744dbb33c16a7a" +SRCREV = "6de3937ac517a3ecfd6d8d90f3f055dab631157e" S = "${WORKDIR}/git" -PV = "2.03.25" +PV = "2.03.26" UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+(\_\d+)+)" -- cgit v1.2.3-54-g00ecf