diff mbox series

[meta-oe,21/35] fio: upgrade 3.42 -> 3.43

Message ID 20260927105002.1832451-21-ankur.tyagi85@gmail.com
State New
Headers show
Series [meta-gnome,1/35] gimp: upgrade 3.2.4 -> 3.2.6 | expand

Commit Message

Ankur Tyagi Sept. 27, 2026, 10:49 a.m. UTC 
From: Ankur Tyagi <ankur.tyagi85@gmail.com>

Dropped patch that is merged in the upstream version.

Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
---
 ...inux-prctl.h-include-to-fix-musl-con.patch | 33 -------------------
 .../fio/{fio_3.42.bb => fio_3.43.bb}          |  3 +-
 2 files changed, 1 insertion(+), 35 deletions(-)
 delete mode 100644 meta-oe/recipes-benchmark/fio/fio/0001-backend-remove-linux-prctl.h-include-to-fix-musl-con.patch
 rename meta-oe/recipes-benchmark/fio/{fio_3.42.bb => fio_3.43.bb} (93%)
diff mbox series

Patch

diff --git a/meta-oe/recipes-benchmark/fio/fio/0001-backend-remove-linux-prctl.h-include-to-fix-musl-con.patch b/meta-oe/recipes-benchmark/fio/fio/0001-backend-remove-linux-prctl.h-include-to-fix-musl-con.patch
deleted file mode 100644
index 9019e06f26..0000000000
--- a/meta-oe/recipes-benchmark/fio/fio/0001-backend-remove-linux-prctl.h-include-to-fix-musl-con.patch
+++ /dev/null
@@ -1,33 +0,0 @@ 
-From 82688fff1241549177ed4d55c27c93117d738947 Mon Sep 17 00:00:00 2001
-From: Lucas Hecht <lucas.hecht@agdsn.de>
-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
-
-Upstream-Status: Backport [a84eece62edd46c1f4c8047f1052ac6181fc8b3e]
-Signed-off-by: Lucas Hecht <lucas.hecht@agdsn.de>
----
- backend.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/backend.c b/backend.c
-index 230d7fd07965..cfc411531818 100644
---- a/backend.c
-+++ b/backend.c
-@@ -32,7 +32,6 @@
- #include <pthread.h>
- 
- #ifdef CONFIG_LINUX
--#include <linux/prctl.h>
- #include <sys/prctl.h>
- #endif
- 
--- 
-2.51.0
-
diff --git a/meta-oe/recipes-benchmark/fio/fio_3.42.bb b/meta-oe/recipes-benchmark/fio/fio_3.43.bb
similarity index 93%
rename from meta-oe/recipes-benchmark/fio/fio_3.42.bb
rename to meta-oe/recipes-benchmark/fio/fio_3.43.bb
index 966ae644b4..928b31ff3d 100644
--- a/meta-oe/recipes-benchmark/fio/fio_3.42.bb
+++ b/meta-oe/recipes-benchmark/fio/fio_3.43.bb
@@ -24,9 +24,8 @@  PACKAGECONFIG[numa] = ",--disable-numa,numactl"
 
 SRC_URI = " \
     git://git.kernel.dk/fio.git;branch=master;tag=${BP} \
-    file://0001-backend-remove-linux-prctl.h-include-to-fix-musl-con.patch \
 "
-SRCREV = "ab77643023f5d7e3c1b71a7576a564f368bf577a"
+SRCREV = "d2dcd7e053d1902d2420f151c83990e6acdd9f8c"
 
 UPSTREAM_CHECK_GITTAGREGEX = "fio-(?P<pver>\d+(\.\d+)+)"