diff mbox series

[meta-oe] xfstests: bstat: use uint32_t instead of __uint32_t to fix build with musl

Message ID 20250427185304.337603-1-martin.jansa@gmail.com
State Under Review
Headers show
Series [meta-oe] xfstests: bstat: use uint32_t instead of __uint32_t to fix build with musl | expand

Commit Message

Martin Jansa April 27, 2025, 6:53 p.m. UTC 
From: Martin Jansa <martin.jansa@gmail.com>

* with musl this fails with:
  http://errors.yoctoproject.org/Errors/Details/853041/

bstat.c:65:33: error: unknown type name '__uint32_t'; did you mean 'uint32_t'?
   65 | static inline int xfs_highbit32(__uint32_t v)
      |                                 ^~~~~~~~~~
      |                                 uint32_t

Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
---
 ..._t-instead-of-__uint32_t-to-fix-buil.patch | 33 +++++++++++++++++++
 .../xfstests/xfstests_2025.03.30.bb           |  1 +
 2 files changed, 34 insertions(+)
 create mode 100644 meta-filesystems/recipes-utils/xfstests/xfstests/0001-bstat-use-uint32_t-instead-of-__uint32_t-to-fix-buil.patch
diff mbox series

Patch

diff --git a/meta-filesystems/recipes-utils/xfstests/xfstests/0001-bstat-use-uint32_t-instead-of-__uint32_t-to-fix-buil.patch b/meta-filesystems/recipes-utils/xfstests/xfstests/0001-bstat-use-uint32_t-instead-of-__uint32_t-to-fix-buil.patch
new file mode 100644
index 0000000000..6ac2dd92b4
--- /dev/null
+++ b/meta-filesystems/recipes-utils/xfstests/xfstests/0001-bstat-use-uint32_t-instead-of-__uint32_t-to-fix-buil.patch
@@ -0,0 +1,33 @@ 
+From c3cc5c68a297a98adb9a7046c7563d0678245243 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <martin.jansa@gmail.com>
+Date: Sun, 27 Apr 2025 20:29:09 +0200
+Subject: [PATCH] bstat: use uint32_t instead of __uint32_t to fix build with
+ musl
+
+* with musl this fails with:
+  http://errors.yoctoproject.org/Errors/Details/853041/
+
+bstat.c:65:33: error: unknown type name '__uint32_t'; did you mean 'uint32_t'?
+   65 | static inline int xfs_highbit32(__uint32_t v)
+      |                                 ^~~~~~~~~~
+      |                                 uint32_t
+
+Upstream-Status: Pending
+Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
+---
+ src/bstat.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/bstat.c b/src/bstat.c
+index 9a028a0d..a833af59 100644
+--- a/src/bstat.c
++++ b/src/bstat.c
+@@ -62,7 +62,7 @@ static inline int fls(int x)
+ 	return r;
+ }
+ 
+-static inline int xfs_highbit32(__uint32_t v)
++static inline int xfs_highbit32(uint32_t v)
+ {
+ 	return fls(v) - 1;
+ }
diff --git a/meta-filesystems/recipes-utils/xfstests/xfstests_2025.03.30.bb b/meta-filesystems/recipes-utils/xfstests/xfstests_2025.03.30.bb
index 94d37c03a9..b300fdb88c 100644
--- a/meta-filesystems/recipes-utils/xfstests/xfstests_2025.03.30.bb
+++ b/meta-filesystems/recipes-utils/xfstests/xfstests_2025.03.30.bb
@@ -12,6 +12,7 @@  SRC_URI = "git://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git;branch=master;ta
            file://0002-Drop-detached_mounts_propagation-and-remove-sys-moun.patch \
            file://0001-include-libgen.h-for-basename-API-prototype.patch \
            file://0002-Add-missing-STATX_ATTR_-defines-from-musl-sys-stat.h.patch \
+           file://0001-bstat-use-uint32_t-instead-of-__uint32_t-to-fix-buil.patch \
            "
 
 S = "${WORKDIR}/git"