diff options
| author | Max Krummenacher <max.oss.09@gmail.com> | 2026-03-06 23:57:37 +0100 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2026-03-17 13:25:13 -0700 |
| commit | 4c98e54b65c4551b1af154c84efdb60ca5290080 (patch) | |
| tree | 7bb2f3ecb43d38b7e25d4b5f772bafbda68ff35f /meta-oe/recipes-benchmark | |
| parent | 46ae413c63fbd5ee8b393254e8efda873c5de65e (diff) | |
| download | meta-openembedded-4c98e54b65c4551b1af154c84efdb60ca5290080.tar.gz | |
fio: fix musl builds
fio 3.40 added the commit 4175f4dbec5d ("oslib: blkzoned: add
blkzoned_move_zone_wp() helper function") which uses
FALLOC_FL_ZERO_RANGE which in a musl build is undefined without
including its header.
Backport the upstream fix.
Signed-off-by: Max Krummenacher <max.oss.09@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-benchmark')
| -rw-r--r-- | meta-oe/recipes-benchmark/fio/fio/0001-fix-musl-builds.patch | 38 | ||||
| -rw-r--r-- | meta-oe/recipes-benchmark/fio/fio_3.41.bb | 5 |
2 files changed, 42 insertions, 1 deletions
diff --git a/meta-oe/recipes-benchmark/fio/fio/0001-fix-musl-builds.patch b/meta-oe/recipes-benchmark/fio/fio/0001-fix-musl-builds.patch new file mode 100644 index 0000000000..6c0d69d6e8 --- /dev/null +++ b/meta-oe/recipes-benchmark/fio/fio/0001-fix-musl-builds.patch | |||
| @@ -0,0 +1,38 @@ | |||
| 1 | From ccce76d2850d6e52da3d7986c950af068fbfe0fd Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Arthur Gautier <arthur.gautier@arista.com> | ||
| 3 | Date: Sat, 13 Dec 2025 20:07:11 -0800 | ||
| 4 | Subject: [PATCH] fix musl builds | ||
| 5 | |||
| 6 | This commit fixes the build on musl which fails with the following | ||
| 7 | error: | ||
| 8 | ``` | ||
| 9 | oslib/linux-blkzoned.c: In function 'blkzoned_move_zone_wp': | ||
| 10 | oslib/linux-blkzoned.c:389:37: error: 'FALLOC_FL_ZERO_RANGE' undeclared (first use in this function) | ||
| 11 | 389 | ret = fallocate(fd, FALLOC_FL_ZERO_RANGE, z->wp, length); | ||
| 12 | | ^~~~~~~~~~~~~~~~~~~~ | ||
| 13 | oslib/linux-blkzoned.c:389:37: note: each undeclared identifier is reported only once for each function it appears in | ||
| 14 | make: *** [Makefile:501: oslib/linux-blkzoned.o] Error 1 | ||
| 15 | make: *** Waiting for unfinished jobs.... | ||
| 16 | ``` | ||
| 17 | |||
| 18 | Upstream-Status: Backport [https://github.com/axboe/fio/commit/ccce76d2850d6e52da3d7986c950af068fbfe0fd] | ||
| 19 | Signed-off-by: Arthur Gautier <arthur.gautier@arista.com> | ||
| 20 | --- | ||
| 21 | oslib/linux-blkzoned.c | 1 + | ||
| 22 | 1 file changed, 1 insertion(+) | ||
| 23 | |||
| 24 | diff --git a/oslib/linux-blkzoned.c b/oslib/linux-blkzoned.c | ||
| 25 | index 78e25fca..c45ef623 100644 | ||
| 26 | --- a/oslib/linux-blkzoned.c | ||
| 27 | +++ b/oslib/linux-blkzoned.c | ||
| 28 | @@ -25,6 +25,7 @@ | ||
| 29 | #ifndef BLKFINISHZONE | ||
| 30 | #define BLKFINISHZONE _IOW(0x12, 136, struct blk_zone_range) | ||
| 31 | #endif | ||
| 32 | +#include <linux/falloc.h> | ||
| 33 | |||
| 34 | /* | ||
| 35 | * If the uapi headers installed on the system lacks zone capacity support, | ||
| 36 | -- | ||
| 37 | 2.51.0 | ||
| 38 | |||
diff --git a/meta-oe/recipes-benchmark/fio/fio_3.41.bb b/meta-oe/recipes-benchmark/fio/fio_3.41.bb index 494a4eb3d7..3f03c41f22 100644 --- a/meta-oe/recipes-benchmark/fio/fio_3.41.bb +++ b/meta-oe/recipes-benchmark/fio/fio_3.41.bb | |||
| @@ -22,7 +22,10 @@ PACKAGECONFIG_NUMA:armeb = "" | |||
| 22 | PACKAGECONFIG ??= "${PACKAGECONFIG_NUMA}" | 22 | PACKAGECONFIG ??= "${PACKAGECONFIG_NUMA}" |
| 23 | PACKAGECONFIG[numa] = ",--disable-numa,numactl" | 23 | PACKAGECONFIG[numa] = ",--disable-numa,numactl" |
| 24 | 24 | ||
| 25 | SRC_URI = "git://git.kernel.dk/fio.git;branch=master;tag=${BP}" | 25 | SRC_URI = " \ |
| 26 | git://git.kernel.dk/fio.git;branch=master;tag=${BP} \ | ||
| 27 | file://0001-fix-musl-builds.patch \ | ||
| 28 | " | ||
| 26 | SRCREV = "ed675d3477a70a42d2e757b713f6c7125a27cdca" | 29 | SRCREV = "ed675d3477a70a42d2e757b713f6c7125a27cdca" |
| 27 | 30 | ||
| 28 | SRC_URI += "file://CVE-2025-10823.patch" | 31 | SRC_URI += "file://CVE-2025-10823.patch" |
