From: Ankur Tyagi <[email protected]> Use PACKAGECONFIG to support liburing which is now disabled by default. Dropped patch which is now merged in the upstream.
Changelog: https://github.com/linux-nvme/libnvme/releases/tag/v1.13 https://github.com/linux-nvme/libnvme/releases/tag/v1.14 https://github.com/linux-nvme/libnvme/releases/tag/v1.15 https://github.com/linux-nvme/libnvme/releases/tag/v1.16 https://github.com/linux-nvme/libnvme/releases/tag/v1.16.1 Signed-off-by: Ankur Tyagi <[email protected]> --- ...k.c-fix-checking-of-HAVE_GLIBC_IOCTL.patch | 41 ------------------- .../{libnvme_1.12.bb => libnvme_1.16.1.bb} | 6 +-- 2 files changed, 3 insertions(+), 44 deletions(-) delete mode 100644 meta-oe/recipes-support/libnvme/files/0001-mock.c-fix-checking-of-HAVE_GLIBC_IOCTL.patch rename meta-oe/recipes-support/libnvme/{libnvme_1.12.bb => libnvme_1.16.1.bb} (88%) diff --git a/meta-oe/recipes-support/libnvme/files/0001-mock.c-fix-checking-of-HAVE_GLIBC_IOCTL.patch b/meta-oe/recipes-support/libnvme/files/0001-mock.c-fix-checking-of-HAVE_GLIBC_IOCTL.patch deleted file mode 100644 index 8734d443bb..0000000000 --- a/meta-oe/recipes-support/libnvme/files/0001-mock.c-fix-checking-of-HAVE_GLIBC_IOCTL.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 14328a9a429fd84ddd1a3ed4fb0eb9643c61fa58 Mon Sep 17 00:00:00 2001 -From: Changqing Li <[email protected]> -Date: Mon, 7 Apr 2025 13:23:57 +0800 -Subject: [PATCH] mock.c: fix checking of HAVE_GLIBC_IOCTL - -Commit [ 0d8d0a55 build: do not include config.h globally ] -changed to always pass -DHAVE_GLIBC_IOCTL=[0|1], and this causes -a regression, for system without glibc ioctl, -DHAVE_GLIBC_IOCTL=0 -is passed, and causes error: -../git/test/ioctl/mock.c:123:5: error: conflicting types for 'ioctl'; have 'int(int, long unsigned int, ...)' - 123 | int ioctl(int fd, unsigned long request, ...) - | ^~~~~ -In file included from ../git/test/ioctl/mock.c:9: -pathto/usr/include/sys/ioctl.h:115:5: note: previous declaration of 'ioctl' with type 'int(int, int, ...)' - 115 | int ioctl (int, int, ...); - -Fixed by checking value of HAVE_GLIBC_IOCTL in mock.c - -Upstream-Status: Submitted [https://github.com/linux-nvme/libnvme/pull/985] - -Signed-off-by: Changqing Li <[email protected]> ---- - test/ioctl/mock.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/test/ioctl/mock.c b/test/ioctl/mock.c -index 7402b45c..da3caba8 100644 ---- a/test/ioctl/mock.c -+++ b/test/ioctl/mock.c -@@ -118,7 +118,7 @@ void end_mock_cmds(void) - } \ - }) - --#ifdef HAVE_GLIBC_IOCTL -+#if defined(HAVE_GLIBC_IOCTL) && HAVE_GLIBC_IOCTL == 1 - typedef int (*ioctl_func_t)(int, unsigned long, void *); - int ioctl(int fd, unsigned long request, ...) - #else --- -2.34.1 - diff --git a/meta-oe/recipes-support/libnvme/libnvme_1.12.bb b/meta-oe/recipes-support/libnvme/libnvme_1.16.1.bb similarity index 88% rename from meta-oe/recipes-support/libnvme/libnvme_1.12.bb rename to meta-oe/recipes-support/libnvme/libnvme_1.16.1.bb index 95d18a1ed0..fbbe141487 100644 --- a/meta-oe/recipes-support/libnvme/libnvme_1.12.bb +++ b/meta-oe/recipes-support/libnvme/libnvme_1.16.1.bb @@ -11,10 +11,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ file://ccan/licenses/CC0;md5=c17af43b05840255a6fedc5eda9d56cc \ file://ccan/licenses/BSD-MIT;md5=838c366f69b72c5df05c96dff79b35f2" DEPENDS = "json-c" -SRCREV = "5ec1f5284ecb0eda481f3d2d61236fbc5b46164f" +SRCREV = "becae3d874b40bfedede672b4b2f58ae8c3be3b5" -SRC_URI = "git://github.com/linux-nvme/libnvme;protocol=https;branch=master \ - file://0001-mock.c-fix-checking-of-HAVE_GLIBC_IOCTL.patch" +SRC_URI = "git://github.com/linux-nvme/libnvme;protocol=https;branch=master" inherit meson pkgconfig @@ -24,3 +23,4 @@ PACKAGECONFIG ??= "keyutils openssl" PACKAGECONFIG[keyutils] = "-Dkeyutils=enabled,-Dkeyutils=disabled,keyutils" PACKAGECONFIG[openssl] = "-Dopenssl=enabled,-Dopenssl=disabled,openssl" PACKAGECONFIG[python] = "-Dpython=enabled,-Dpython=disabled,python" +PACKAGECONFIG[liburing] = "-Dliburing=enabled,-Dliburing=disabled,liburing"
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#121680): https://lists.openembedded.org/g/openembedded-devel/message/121680 Mute This Topic: https://lists.openembedded.org/mt/116287246/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
