diff options
author | Yi Zhao <yi.zhao@windriver.com> | 2024-09-12 10:45:53 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2024-09-11 21:15:34 -0700 |
commit | afa14207fe5dbf2c94373a65292cb608279b9241 (patch) | |
tree | ecfd1f45829609bdd8901d5ff40ee055dc175607 | |
parent | 8bfa4262813f88726ccb9f851c2e97fca1cf933d (diff) | |
download | meta-openembedded-afa14207fe5dbf2c94373a65292cb608279b9241.tar.gz |
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 <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | meta-oe/recipes-support/lvm2/files/0001-configure.ac-check-egrep.patch | 33 | ||||
-rw-r--r-- | meta-oe/recipes-support/lvm2/lvm2.inc | 5 |
2 files changed, 2 insertions, 36 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 @@ | |||
1 | From f261b2f1bc16c32a55a22e28bf1b2f15ac6c7a88 Mon Sep 17 00:00:00 2001 | ||
2 | From: Kai Kang <kai.kang@windriver.com> | ||
3 | Date: Wed, 6 Dec 2023 10:24:46 +0800 | ||
4 | Subject: [PATCH] configure.ac: check egrep | ||
5 | |||
6 | The macro AC_HEADER_STDC which requires AC_PROG_EGREP has been removed | ||
7 | from 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 | |||
13 | Call AC_PROG_EGREP to fix the error. | ||
14 | |||
15 | Upstream-Status: Submitted [https://gitlab.com/lvmteam/lvm2/-/merge_requests/4] | ||
16 | |||
17 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
18 | --- | ||
19 | configure.ac | 1 + | ||
20 | 1 file changed, 1 insertion(+) | ||
21 | |||
22 | diff --git a/configure.ac b/configure.ac | ||
23 | index 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/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 \ | |||
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 | ||
22 | SRCREV = "0eef5ab6e14a45e6d2eacbc0bb744dbb33c16a7a" | 21 | SRCREV = "6de3937ac517a3ecfd6d8d90f3f055dab631157e" |
23 | S = "${WORKDIR}/git" | 22 | S = "${WORKDIR}/git" |
24 | PV = "2.03.25" | 23 | PV = "2.03.26" |
25 | 24 | ||
26 | UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\_\d+)+)" | 25 | UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\_\d+)+)" |
27 | 26 | ||