From 39dfe8a24b01ac76def80a59392ca7b7b253b248 Mon Sep 17 00:00:00 2001 From: Nguyen Dat Tho Date: Fri, 4 Apr 2025 12:41:48 +0900 Subject: f2fs-tools: Fix build with gcc-15 Backport patch to fix error: https://errors.yoctoproject.org/Errors/Details/850170/ Signed-off-by: Nguyen Dat Tho Signed-off-by: Khem Raj --- ...-f2fs-tools-use-stdbool.h-instead-of-bool.patch | 40 ++++++++++++++++++++++ .../recipes-utils/f2fs-tools/f2fs-tools_1.16.0.bb | 1 + 2 files changed, 41 insertions(+) create mode 100644 meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0001-f2fs-tools-use-stdbool.h-instead-of-bool.patch diff --git a/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0001-f2fs-tools-use-stdbool.h-instead-of-bool.patch b/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0001-f2fs-tools-use-stdbool.h-instead-of-bool.patch new file mode 100644 index 0000000000..4981c2151d --- /dev/null +++ b/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0001-f2fs-tools-use-stdbool.h-instead-of-bool.patch @@ -0,0 +1,40 @@ +From 6617d15a660becc23825007ab3fc2d270b5b250f Mon Sep 17 00:00:00 2001 +From: Jaegeuk Kim +Date: Thu, 24 Oct 2024 20:33:38 +0000 +Subject: [PATCH] f2fs-tools: use stdbool.h instead of bool + +The existing bool definition is broken for c23,i where bool is now a keyword. + +Upstream-Status: Backport [https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git/commit/?id=6617d15a660becc23825007ab3fc2d270b5b250f] + +Signed-off-by: Elliott Hughes +Signed-off-by: Jaegeuk Kim +--- + include/f2fs_fs.h | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/include/f2fs_fs.h b/include/f2fs_fs.h +index 9534da9..0cb9228 100644 +--- a/include/f2fs_fs.h ++++ b/include/f2fs_fs.h +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + + #ifdef HAVE_CONFIG_H + #include +@@ -119,9 +120,6 @@ typedef uint16_t u16; + typedef uint8_t u8; + typedef u32 block_t; + typedef u32 nid_t; +-#ifndef bool +-typedef u8 bool; +-#endif + typedef unsigned long pgoff_t; + typedef unsigned short umode_t; + +-- +2.34.1 + diff --git a/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.16.0.bb b/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.16.0.bb index 997fa1240a..a51c2ef8bd 100644 --- a/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.16.0.bb +++ b/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.16.0.bb @@ -9,6 +9,7 @@ DEPENDS = "util-linux" SRCREV = "06c027abc6153c4a97cba5317844e8dcaaee3cf7" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git;branch=master \ + file://0001-f2fs-tools-use-stdbool.h-instead-of-bool.patch \ file://0002-f2fs_io-Define-_FILE_OFFSET_BITS-64.patch \ " UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+(\.\d+)+)" -- cgit v1.2.3-54-g00ecf