From fe8d5e0cc0abbe19aa267ab7f9e78cbb5adc153b Mon Sep 17 00:00:00 2001 From: Ankur Tyagi Date: Fri, 14 Nov 2025 22:47:03 +1300 Subject: liburing: upgrade 2.9 -> 2.12 Dropped patch which is now merged upstream. Changelog: https://github.com/axboe/liburing/releases/tag/liburing-2.10 https://github.com/axboe/liburing/releases/tag/liburing-2.11 https://github.com/axboe/liburing/releases/tag/liburing-2.12 Signed-off-by: Ankur Tyagi Signed-off-by: Khem Raj --- ...est-Including-missing-string.h-for-memcpy.patch | 39 ---------------------- meta-oe/recipes-support/liburing/liburing_2.12.bb | 34 +++++++++++++++++++ meta-oe/recipes-support/liburing/liburing_2.9.bb | 35 ------------------- 3 files changed, 34 insertions(+), 74 deletions(-) delete mode 100644 meta-oe/recipes-support/liburing/liburing/0001-test-Including-missing-string.h-for-memcpy.patch create mode 100644 meta-oe/recipes-support/liburing/liburing_2.12.bb delete mode 100644 meta-oe/recipes-support/liburing/liburing_2.9.bb 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 deleted file mode 100644 index f744812a3f..0000000000 --- a/meta-oe/recipes-support/liburing/liburing/0001-test-Including-missing-string.h-for-memcpy.patch +++ /dev/null @@ -1,39 +0,0 @@ -From c55874bc28f66d606527b940d4bd0f266bbaaa2c Mon Sep 17 00:00:00 2001 -From: Khem Raj -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 ---- - 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 - #include - #include -+#include - - #include - #include -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 - #include - #include -+#include - #include "liburing.h" - #include "helpers.h" - diff --git a/meta-oe/recipes-support/liburing/liburing_2.12.bb b/meta-oe/recipes-support/liburing/liburing_2.12.bb new file mode 100644 index 0000000000..2519d650a6 --- /dev/null +++ b/meta-oe/recipes-support/liburing/liburing_2.12.bb @@ -0,0 +1,34 @@ +SUMMARY = "This is the io_uring library, liburing." +DESCRIPTION = "liburing provides helpers to setup and teardown io_uring \ +instances, and also a simplified interface for applications that don't need \ +(or want) to deal with the full kernel side implementation." +HOMEPAGE = "https://github.com/axboe/liburing" +BUGTRACKER = "https://github.com/axboe/liburing/issues" +SECTION = "libs" + +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" +SRCREV = "e907d6a342e80b70874f93abd440b92b8a40b7bc" + + +DEPENDS:append:libc-musl = " libucontext" +XCFLAGS = "-pthread" +XCFLAGS:append:libc-musl = " -lucontext" + +USELIBC = "" +# clang-18+ on RV64 emits memset for arch/riscv64/syscall.h provided __do_syscall4 macro +# this does not happen for gcc or older clang, so link with libc since we need memset API +# -fno-builtin-memset does not help +USELIBC:riscv64:toolchain-clang = "--use-libc" +USELIBC:riscv32 = "--use-libc" +EXTRA_OEMAKE = "'CC=${CC}' 'RANLIB=${RANLIB}' 'AR=${AR}' 'CFLAGS=${CFLAGS} -I${S}/include -DWITHOUT_XATTR' 'LDFLAGS=${LDFLAGS}' 'XCFLAGS=${XCFLAGS}' 'BUILDDIR=${S}'" +do_configure() { + ${S}/configure --prefix=${prefix} --libdir=${libdir} --libdevdir=${libdir} --mandir=${mandir} --datadir=${datadir} --includedir=${includedir} ${USELIBC} +} +do_install () { + oe_runmake install DESTDIR=${D} +} + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/liburing/liburing_2.9.bb b/meta-oe/recipes-support/liburing/liburing_2.9.bb deleted file mode 100644 index a645a8e4c4..0000000000 --- a/meta-oe/recipes-support/liburing/liburing_2.9.bb +++ /dev/null @@ -1,35 +0,0 @@ -SUMMARY = "This is the io_uring library, liburing." -DESCRIPTION = "liburing provides helpers to setup and teardown io_uring \ -instances, and also a simplified interface for applications that don't need \ -(or want) to deal with the full kernel side implementation." -HOMEPAGE = "https://github.com/axboe/liburing" -BUGTRACKER = "https://github.com/axboe/liburing/issues" -SECTION = "libs" - -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-Including-missing-string.h-for-memcpy.patch" -SRCREV = "08468cc3830185c75f9e7edefd88aa01e5c2f8ab" - - -DEPENDS:append:libc-musl = " libucontext" -XCFLAGS = "-pthread" -XCFLAGS:append:libc-musl = " -lucontext" - -USELIBC = "" -# clang-18+ on RV64 emits memset for arch/riscv64/syscall.h provided __do_syscall4 macro -# this does not happen for gcc or older clang, so link with libc since we need memset API -# -fno-builtin-memset does not help -USELIBC:riscv64:toolchain-clang = "--use-libc" -USELIBC:riscv32 = "--use-libc" -EXTRA_OEMAKE = "'CC=${CC}' 'RANLIB=${RANLIB}' 'AR=${AR}' 'CFLAGS=${CFLAGS} -I${S}/include -DWITHOUT_XATTR' 'LDFLAGS=${LDFLAGS}' 'XCFLAGS=${XCFLAGS}' 'BUILDDIR=${S}'" -do_configure() { - ${S}/configure --prefix=${prefix} --libdir=${libdir} --libdevdir=${libdir} --mandir=${mandir} --datadir=${datadir} --includedir=${includedir} ${USELIBC} -} -do_install () { - oe_runmake install DESTDIR=${D} -} - -BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf