diff --git a/meta-networking/recipes-support/rdma-core/rdma-core/0001-cmake-Allow-SYSTEMCTL_BIN-to-be-overridden-from-envi.patch b/meta-networking/recipes-support/rdma-core/rdma-core/0001-cmake-Allow-SYSTEMCTL_BIN-to-be-overridden-from-envi.patch index e181ee2872..d6c641d90b 100644 --- a/meta-networking/recipes-support/rdma-core/rdma-core/0001-cmake-Allow-SYSTEMCTL_BIN-to-be-overridden-from-envi.patch +++ b/meta-networking/recipes-support/rdma-core/rdma-core/0001-cmake-Allow-SYSTEMCTL_BIN-to-be-overridden-from-envi.patch @@ -17,8 +17,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 98985e7ee..001efb800 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -237,7 +237,10 @@ else() - endif() +@@ -256,7 +256,10 @@ else() + message(WARNING "pyverbs build requested but python development files not found") endif() -find_program(SYSTEMCTL_BIN systemctl HINTS "/usr/bin" "/bin") diff --git a/meta-networking/recipes-support/rdma-core/rdma-core/0001-include-libgen.h-for-basename.patch b/meta-networking/recipes-support/rdma-core/rdma-core/0001-include-libgen.h-for-basename.patch deleted file mode 100644 index a093e47048..0000000000 --- a/meta-networking/recipes-support/rdma-core/rdma-core/0001-include-libgen.h-for-basename.patch +++ /dev/null @@ -1,58 +0,0 @@ -From ae6adc4c748e67919fdf8ae1d44c619ee104c271 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 25 Mar 2024 11:37:41 -0700 -Subject: [PATCH] include libgen.h for basename - -basename prototype has been removed from string.h from latest musl [1] -compilers e.g. clang-18 flags the absense of prototype as error. therefore -include libgen.h for providing it. - -[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7 - -Upstream-Status: Submitted [https://github.com/linux-rdma/rdma-core/pull/1443] -Signed-off-by: Khem Raj ---- - kernel-boot/rdma_rename.c | 1 + - librdmacm/examples/rping.c | 1 + - providers/mlx5/mlx5_vfio.c | 1 + - 3 files changed, 3 insertions(+) - -diff --git a/kernel-boot/rdma_rename.c b/kernel-boot/rdma_rename.c -index 4af9e4a39..5193ac411 100644 ---- a/kernel-boot/rdma_rename.c -+++ b/kernel-boot/rdma_rename.c -@@ -2,6 +2,7 @@ - /* Copyright (c) 2019, Mellanox Technologies. All rights reserved. See COPYING file */ - - #define _GNU_SOURCE -+#include - #include - #include - #include -diff --git a/librdmacm/examples/rping.c b/librdmacm/examples/rping.c -index cc16ad910..0f1321458 100644 ---- a/librdmacm/examples/rping.c -+++ b/librdmacm/examples/rping.c -@@ -33,6 +33,7 @@ - #define _GNU_SOURCE - #include - #include -+#include - #include - #include - #include -diff --git a/providers/mlx5/mlx5_vfio.c b/providers/mlx5/mlx5_vfio.c -index cd0c41462..4d064b1fc 100644 ---- a/providers/mlx5/mlx5_vfio.c -+++ b/providers/mlx5/mlx5_vfio.c -@@ -6,6 +6,7 @@ - #define _GNU_SOURCE - #include - -+#include - #include - #include - #include --- -2.44.0 - diff --git a/meta-networking/recipes-support/rdma-core/rdma-core/0001-librdmacm-Use-overloadable-function-attribute-with-c.patch b/meta-networking/recipes-support/rdma-core/rdma-core/0001-librdmacm-Use-overloadable-function-attribute-with-c.patch deleted file mode 100644 index 092f4431bf..0000000000 --- a/meta-networking/recipes-support/rdma-core/rdma-core/0001-librdmacm-Use-overloadable-function-attribute-with-c.patch +++ /dev/null @@ -1,38 +0,0 @@ -From c7de6834f0cd92b7341ab17a5c6996f3fbd40140 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 21 Jun 2024 22:16:47 -0700 -Subject: [PATCH] librdmacm: Use overloadable function attribute with clang - - This is to fix build warnings seen with upcoming clang19 and - glibc 2.40, since glibc 2.40 has improved fortyfying this - function with clang, it ends up with build errors like below - -librdmacm/preload.c:796:9: error: at most one overload for a given name may lack the 'overloadable' attribute -| 796 | ssize_t recvfrom(int socket, void *buf, size_t len, int flags, -| | ^ -| /mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/rdma-core/51.0/recipe-sysroot/usr/include/sys/socket.h:163:16: note: previous unmarked overload of function is here -| 163 | extern ssize_t recvfrom (int __fd, void *__restrict __buf, size_t __n, -| | ^ - -Upstream-Status: Submitted [https://github.com/linux-rdma/rdma-core/pull/1475] -Signed-off-by: Khem Raj ---- - librdmacm/preload.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - ---- a/librdmacm/preload.c -+++ b/librdmacm/preload.c -@@ -792,8 +792,11 @@ ssize_t recv(int socket, void *buf, size - return (fd_fork_get(socket, &fd) == fd_rsocket) ? - rrecv(fd, buf, len, flags) : real.recv(fd, buf, len, flags); - } -- --ssize_t recvfrom(int socket, void *buf, size_t len, int flags, -+ssize_t -+#if defined(__clang__) && defined(__GLIBC__) -+__attribute__((overloadable)) -+#endif -+recvfrom(int socket, void *buf, size_t len, int flags, - struct sockaddr *src_addr, socklen_t *addrlen) - { - int fd; diff --git a/meta-networking/recipes-support/rdma-core/rdma-core_51.0.bb b/meta-networking/recipes-support/rdma-core/rdma-core_62.0.bb similarity index 85% rename from meta-networking/recipes-support/rdma-core/rdma-core_51.0.bb rename to meta-networking/recipes-support/rdma-core/rdma-core_62.0.bb index 2555c43a85..5a8640ad02 100644 --- a/meta-networking/recipes-support/rdma-core/rdma-core_51.0.bb +++ b/meta-networking/recipes-support/rdma-core/rdma-core_62.0.bb @@ -5,12 +5,10 @@ SECTION = "libs" DEPENDS = "libnl" RDEPENDS:${PN} = "bash perl" -SRC_URI = "git://github.com/linux-rdma/rdma-core.git;branch=master;protocol=https \ +SRC_URI = "git://github.com/linux-rdma/rdma-core.git;branch=master;protocol=https;tag=v${PV} \ file://0001-cmake-Allow-SYSTEMCTL_BIN-to-be-overridden-from-envi.patch \ - file://0001-include-libgen.h-for-basename.patch \ - file://0001-librdmacm-Use-overloadable-function-attribute-with-c.patch \ " -SRCREV = "6cd09097ad2eebde9a7fa3d3bb09a2cea6e3c2d6" +SRCREV = "31af04ec84378724cb6256814d4ffde359a7123b" #Default Dual License https://github.com/linux-rdma/rdma-core/blob/master/COPYING.md LICENSE = "BSD-2-Clause | GPL-2.0-only"