mirror of
https://git.yoctoproject.org/poky
synced 2026-04-26 18:32:13 +02:00
e2fsprogs: 1.47.1 -> 1.47.3
* Remove backported patch 0001-libext2fs-fix-std-c23-build-failure.patch * Fixed QA Issue: ERROR: e2fsprogs-1.47.2-r0 do_package_qa: QA Issue: File /usr/lib/e2fsprogs/ptest/test/test_one in package e2fsprogs-ptest contains reference to TMPDIR [buildpaths] (From OE-Core rev: 27b191cd6f53a444efbf82f58d86bf0dc5c1a048) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
2f75d95487
commit
3d691e6740
@@ -1,42 +0,0 @@
|
||||
From 72dcef02bee9924c4d5b3dc6e7ef4d07becebcc6 Mon Sep 17 00:00:00 2001
|
||||
From: Rudi Heitbaum <rudi@heitbaum.com>
|
||||
Date: Fri, 22 Nov 2024 12:36:32 +0000
|
||||
Subject: [PATCH] libext2fs: fix -std=c23 build failure
|
||||
|
||||
gcc-15 switched to -std=c23 by default:
|
||||
|
||||
https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=55e3bd376b2214e200fa76d12b67ff259b06c212
|
||||
|
||||
As a result `e2fsprogs` fails the build so only typedef int bool
|
||||
for __STDC_VERSION__ <= 201710L (C17)
|
||||
|
||||
../../../lib/ext2fs/tdb.c:113:13: error: two or more data types in declaration specifiers
|
||||
../../../lib/ext2fs/tdb.c:113:1: warning: useless type name in empty declaration
|
||||
113 | typedef int bool;
|
||||
| ^~~~~~~
|
||||
|
||||
https://github.com/tytso/e2fsprogs/issues/202
|
||||
|
||||
Upstream-Status: Backport [https://github.com/tytso/e2fsprogs/commit/49fd04d77b3244c6c6990be41142168eef373aef]
|
||||
Signed-off-by: Rudi Heitbaum <rudi@heitbaum.com>
|
||||
Link: https://lore.kernel.org/r/Z0B60JhdvT9bpSQ6@6f91903e89da
|
||||
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
lib/ext2fs/tdb.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/lib/ext2fs/tdb.c b/lib/ext2fs/tdb.c
|
||||
index b07b2917..98dc95d8 100644
|
||||
--- a/lib/ext2fs/tdb.c
|
||||
+++ b/lib/ext2fs/tdb.c
|
||||
@@ -110,7 +110,9 @@ static char *rep_strdup(const char *s)
|
||||
#endif
|
||||
#endif
|
||||
|
||||
+#if defined __STDC__ && defined __STDC_VERSION__ && __STDC_VERSION__ <= 201710L
|
||||
typedef int bool;
|
||||
+#endif
|
||||
|
||||
#include "tdb.h"
|
||||
|
||||
@@ -4,14 +4,13 @@ SRC_URI += "file://remove.ldconfig.call.patch \
|
||||
file://run-ptest \
|
||||
file://ptest.patch \
|
||||
file://mkdir_p.patch \
|
||||
file://0001-libext2fs-fix-std-c23-build-failure.patch \
|
||||
"
|
||||
SRC_URI:append:class-native = " \
|
||||
file://e2fsprogs-fix-missing-check-for-permission-denied.patch \
|
||||
file://quiet-debugfs.patch \
|
||||
"
|
||||
|
||||
SRCREV = "b571b9b4240739a982e8bca62cfc914a3b50190a"
|
||||
SRCREV = "da631e117dcf8797bfda0f48bdaa05ac0fbcf7af"
|
||||
UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+(\.\d+)*)$"
|
||||
|
||||
EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} \
|
||||
@@ -119,7 +118,7 @@ ALTERNATIVE:${PN}-tune2fs = "tune2fs"
|
||||
ALTERNATIVE_LINK_NAME[tune2fs] = "${base_sbindir}/tune2fs"
|
||||
|
||||
RDEPENDS:e2fsprogs-e2scrub = "bash"
|
||||
RDEPENDS:${PN}-ptest += "coreutils procps bash bzip2 diffutils perl sed"
|
||||
RDEPENDS:${PN}-ptest += "coreutils procps bash bzip2 diffutils perl sed grep"
|
||||
RDEPENDS:${PN}-ptest += "e2fsprogs-badblocks e2fsprogs-dumpe2fs e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-resize2fs e2fsprogs-tune2fs"
|
||||
|
||||
do_compile_ptest() {
|
||||
@@ -134,7 +133,8 @@ do_install_ptest() {
|
||||
sed -e 's!../e2fsck/e2fsck!e2fsck!g' \
|
||||
-e 's!../misc/tune2fs!tune2fs!g' -i ${D}${PTEST_PATH}/test/*/expect*
|
||||
sed -e 's!../e2fsck/e2fsck!${base_sbindir}/e2fsck!g' -i ${D}${PTEST_PATH}/test/*/script
|
||||
sed -i "s#@PTEST_PATH@#${PTEST_PATH}#g" ${D}${PTEST_PATH}/test/test_script ${D}${PTEST_PATH}/test/test_one
|
||||
sed -i -e 's#@PTEST_PATH@#${PTEST_PATH}#g' -e 's#^EGREP=.*#EGREP="grep -E"#' \
|
||||
${D}${PTEST_PATH}/test/test_script ${D}${PTEST_PATH}/test/test_one
|
||||
|
||||
# Remove various files
|
||||
find "${D}${PTEST_PATH}" -type f \
|
||||
Reference in New Issue
Block a user