5 files changed, 41 insertions, 106 deletions

diff --git a/meta-oe/recipes-support/liburing/liburing/0001-test-Compile-nolibc.c-only-when-CONFIG_NOLIBC-is-set.patch b/meta-oe/recipes-support/liburing/liburing/0001-test-Compile-nolibc.c-only-when-CONFIG_NOLIBC-is-set.patch
deleted file mode 100644
index 90f028b856..0000000000
--- a/meta-oe/recipes-support/liburing/liburing/0001-test-Compile-nolibc.c-only-when-CONFIG_NOLIBC-is-set.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 7ea4e55a91e6d5564c6de762c2d1afc78ff9cfd3 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 16 Sep 2024 22:58:38 +0000
-Subject: [PATCH] test: Compile nolibc.c only when CONFIG_NOLIBC is set
-
-building nolibc.c fails for non nolibc targets
-
-Fixes
-In file included from nolibc.c:33:
-./../src/lib.h:20:2: error: "This arch doesn't support building liburing without libc"
-   20 | #error "This arch doesn't support building liburing without libc"
-      |  ^
-1 error generated.
-
-Upstream-Status: Backport [https://github.com/axboe/liburing/commit/a182f62c01f981cd9dd508ec952fbc975b263e3d]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- test/Makefile | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/test/Makefile b/test/Makefile
-index 0538a75..0dfecb8 100644
---- a/test/Makefile
-+++ b/test/Makefile
-@@ -126,7 +126,6 @@ test_srcs := \
-        msg-ring-overflow.c \
-        multicqes_drain.c \
-        no-mmap-inval.c \
--       nolibc.c \
-        nop-all-sizes.c \
-        nop.c \
-        ooo-file-unreg.c \
-@@ -221,6 +220,10 @@ test_srcs := \
- all_targets :=
- include ../Makefile.quiet
- 
-+ifeq ($(CONFIG_NOLIBC),y)
-+       test_srcs += nolibc.c
-+endif
-+
- ifdef CONFIG_HAVE_STATX
-        test_srcs += statx.c
- else ifdef CONFIG_HAVE_GLIBC_STATX
diff --git a/meta-oe/recipes-support/liburing/liburing/0001-test-Drop-including-error.h-header.patch b/meta-oe/recipes-support/liburing/liburing/0001-test-Drop-including-error.h-header.patch
deleted file mode 100644
index 62ca78a1ed..0000000000
--- a/meta-oe/recipes-support/liburing/liburing/0001-test-Drop-including-error.h-header.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 684bcb2a8795fd399d6c164e51459a2785057b1c Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 17 Sep 2024 09:56:42 -0700
-Subject: [PATCH 1/2] test: Drop including error.h header
-
-There is no error APIs being used in this test, therefore
-drop including it, this also makes it portable to musl
-systems which do not have error.h
-
-Upstream-Status: Submitted [https://github.com/axboe/liburing/pull/1233]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- test/init-mem.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/test/init-mem.c b/test/init-mem.c
-index 6f9a02a..f512190 100644
---- a/test/init-mem.c
-+++ b/test/init-mem.c
-@@ -13,7 +13,6 @@
- #include <netinet/udp.h>
- #include <arpa/inet.h>
- #include <net/if.h>
--#include <error.h>
- 
- #include "liburing.h"
- #include "helpers.h"
diff --git a/meta-oe/recipes-support/liburing/liburing/0001-test-Including-missing-string.h-for-memcpy.patch b/meta-oe/recipes-support/liburing/liburing/0001-test-Including-missing-string.h-for-memcpy.patch
new file mode 100644
index 0000000000..f744812a3f
--- /dev/null
+++ b/meta-oe/recipes-support/liburing/liburing/0001-test-Including-missing-string.h-for-memcpy.patch
@@ -0,0 +1,39 @@
+From c55874bc28f66d606527b940d4bd0f266bbaaa2c Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 17 Feb 2025 11:51:19 -0800
+Subject: [PATCH] test: Including missing string.h for memcpy
+
+Fixes
+accept-test.c:39:2: error: call to undeclared library function 'memcpy' with type 'void *(void *, const void *, unsigned long)'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
+
+Upstream-Status: Submitted [https://github.com/axboe/liburing/pull/1351]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ test/232c93d07b74.c | 1 +
+ test/accept-test.c  | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/test/232c93d07b74.c b/test/232c93d07b74.c
+index d3053b9..d5677d3 100644
+--- a/test/232c93d07b74.c
++++ b/test/232c93d07b74.c
+@@ -10,6 +10,7 @@
+ #include <stdlib.h>
+ #include <stdint.h>
+ #include <assert.h>
++#include <string.h>
+ 
+ #include <pthread.h>
+ #include <errno.h>
+diff --git a/test/accept-test.c b/test/accept-test.c
+index 99f6080..142b2de 100644
+--- a/test/accept-test.c
++++ b/test/accept-test.c
+@@ -7,6 +7,7 @@
+ #include <sys/socket.h>
+ #include <sys/un.h>
+ #include <assert.h>
++#include <string.h>
+ #include "liburing.h"
+ #include "helpers.h"
+ 
diff --git a/meta-oe/recipes-support/liburing/liburing/0002-ooo-file-unreg.c-Include-poll.h-instead-of-sys-poll..patch b/meta-oe/recipes-support/liburing/liburing/0002-ooo-file-unreg.c-Include-poll.h-instead-of-sys-poll..patch
deleted file mode 100644
index 8a1d542502..0000000000
--- a/meta-oe/recipes-support/liburing/liburing/0002-ooo-file-unreg.c-Include-poll.h-instead-of-sys-poll..patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From d06433ff1a1905436cfcde80e22ee51bd9591536 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 17 Sep 2024 09:59:31 -0700
-Subject: [PATCH 2/2] ooo-file-unreg.c: Include poll.h instead of sys/poll.h
-
-This fixes a warning e.g.
-
-In file included from ooo-file-unreg.c:12:
-/mnt/b/yoe/master/build/tmp/work/riscv32-yoe-linux-musl/liburing/2.7/recipe-sysroot/usr/include/sys/poll.h:1:2: warning: redirecting incorrect #include <sys/poll.h> to <poll.h> [-W#warnings]
-    1 | #warning redirecting incorrect #include <sys/poll.h> to <poll.h>
-      |  ^
-1 warning generated.
-
-Upstream-Status: Submitted [https://github.com/axboe/liburing/pull/1233]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- test/ooo-file-unreg.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/ooo-file-unreg.c b/test/ooo-file-unreg.c
-index d76e0fb..dd6ea55 100644
---- a/test/ooo-file-unreg.c
-+++ b/test/ooo-file-unreg.c
-@@ -9,7 +9,7 @@
- #include <sys/socket.h>
- #include <unistd.h>
- #include <stdlib.h>
--#include <sys/poll.h>
-+#include <poll.h>
- 
- #include "liburing.h"
- #include "helpers.h"
diff --git a/meta-oe/recipes-support/liburing/liburing_2.7.bb b/meta-oe/recipes-support/liburing/liburing_2.9.bb
index b10fe40ca0..e17d829c3d 100644
--- a/meta-oe/recipes-support/liburing/liburing_2.7.bb
+++ b/meta-oe/recipes-support/liburing/liburing_2.9.bb
@@ -10,10 +10,8 @@ LICENSE = "LGPL-2.1-only | MIT"
 LIC_FILES_CHKSUM = "file://README;beginline=41;endline=44;md5=2b0e9926530c269f5ae95560370195af"
 
 SRC_URI = "git://github.com/axboe/liburing.git;branch=master;protocol=https \
-           file://0001-test-Compile-nolibc.c-only-when-CONFIG_NOLIBC-is-set.patch \
-           file://0001-test-Drop-including-error.h-header.patch \
-           file://0002-ooo-file-unreg.c-Include-poll.h-instead-of-sys-poll..patch"
-SRCREV = "5227d48b28ad8671e61d444b72678da584d2e6c3"
+           file://0001-test-Including-missing-string.h-for-memcpy.patch"
+SRCREV = "08468cc3830185c75f9e7edefd88aa01e5c2f8ab"
 
 S = "${WORKDIR}/git"