diff --git a/package/fio/0001-backend-remove-linux-prctl.h-include-to-fix-musl-con.patch b/package/fio/0001-backend-remove-linux-prctl.h-include-to-fix-musl-con.patch new file mode 100644 index 0000000000..0704b02aef --- /dev/null +++ b/package/fio/0001-backend-remove-linux-prctl.h-include-to-fix-musl-con.patch @@ -0,0 +1,36 @@ +From a84eece62edd46c1f4c8047f1052ac6181fc8b3e Mon Sep 17 00:00:00 2001 +From: Lucas Hecht +Date: Tue, 26 May 2026 18:49:48 +0200 +Subject: [PATCH] backend: remove linux/prctl.h include to fix musl conflict + +Building with musl fails due to a duplicate definition of prctl_mm_map. +This is because musl redefines linux/prctl.h in sys/prctl.h. + +This commit removes the linux/prctl.h include. + +Fixes: #2096 + +Signed-off-by: Lucas Hecht + +Upstream: https://github.com/axboe/fio/commit/a84eece62edd46c1f4c8047f1052ac6181fc8b3e + +Signed-off-by: Bernd Kuhls +--- + backend.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/backend.c b/backend.c +index f6023d0e..e2b33b14 100644 +--- a/backend.c ++++ b/backend.c +@@ -32,7 +32,6 @@ + #include + + #ifdef CONFIG_LINUX +-#include + #include + #endif + +-- +2.47.3 + diff --git a/package/fio/0001-fix-musl-builds.patch b/package/fio/0001-fix-musl-builds.patch deleted file mode 100644 index 16c3d3836d..0000000000 --- a/package/fio/0001-fix-musl-builds.patch +++ /dev/null @@ -1,38 +0,0 @@ -From ccce76d2850d6e52da3d7986c950af068fbfe0fd Mon Sep 17 00:00:00 2001 -From: Arthur Gautier -Date: Sat, 13 Dec 2025 20:07:11 -0800 -Subject: [PATCH] fix musl builds - -This commit fixes the build on musl which fails with the following -error: -``` -oslib/linux-blkzoned.c: In function 'blkzoned_move_zone_wp': -oslib/linux-blkzoned.c:389:37: error: 'FALLOC_FL_ZERO_RANGE' undeclared (first use in this function) - 389 | ret = fallocate(fd, FALLOC_FL_ZERO_RANGE, z->wp, length); - | ^~~~~~~~~~~~~~~~~~~~ -oslib/linux-blkzoned.c:389:37: note: each undeclared identifier is reported only once for each function it appears in -make: *** [Makefile:501: oslib/linux-blkzoned.o] Error 1 -make: *** Waiting for unfinished jobs.... -``` - -Signed-off-by: Arthur Gautier - -Upstream: https://github.com/axboe/fio/commit/ccce76d2850d6e52da3d7986c950af068fbfe0fd - -Signed-off-by: Bernd Kuhls ---- - oslib/linux-blkzoned.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/oslib/linux-blkzoned.c b/oslib/linux-blkzoned.c -index 78e25fca91..c45ef623de 100644 ---- a/oslib/linux-blkzoned.c -+++ b/oslib/linux-blkzoned.c -@@ -25,6 +25,7 @@ - #ifndef BLKFINISHZONE - #define BLKFINISHZONE _IOW(0x12, 136, struct blk_zone_range) - #endif -+#include - - /* - * If the uapi headers installed on the system lacks zone capacity support, diff --git a/package/fio/fio.hash b/package/fio/fio.hash index 015f2e3fbe..0a86e4092c 100644 --- a/package/fio/fio.hash +++ b/package/fio/fio.hash @@ -1,8 +1,8 @@ # From https://brick.kernel.dk/snaps/MD5SUMS -md5 3cd7ea766be83b560a14c909cdd35889 fio-3.41.tar.gz +md5 0e817db93ecf11a4797aea757f29c91d fio-3.42.tar.gz # Locally computed after checking gpg signature from -# https://brick.kernel.dk/snaps/fio-3.41.tar.gz.asc +# https://brick.kernel.dk/snaps/fio-3.42.tar.gz.asc # with key C0FC392DCADE26D975FA5E4AF7D358FB2971E0A6 -sha256 a40b45112005e30a67bab6be4860b198c35104a628b6ec4d15720d62b5d1bab9 fio-3.41.tar.gz +sha256 9128d0c81bd7bffab0dd06cbfb755a05ef92f3b8a0b0c61f1b3538df6750f1e0 fio-3.42.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 8a240c1ad13d1fe3e58588643d81d0695899be4a669fe6d8fafa76ca6a89db2c MORAL-LICENSE diff --git a/package/fio/fio.mk b/package/fio/fio.mk index 38e7aa7967..890631e9fa 100644 --- a/package/fio/fio.mk +++ b/package/fio/fio.mk @@ -4,7 +4,7 @@ # ################################################################################ -FIO_VERSION = 3.41 +FIO_VERSION = 3.42 FIO_SITE = https://brick.kernel.dk/snaps FIO_LICENSE = GPL-2.0 FIO_LICENSE_FILES = COPYING MORAL-LICENSE