mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-04-02 02:49:12 +00:00
rdma-core: upgrade 51.0 -> 62.0
v51 series will get support only for about 2 more years, but v62 just started its ~4 years long support cycle. Drop patches that are included in this release, or were solved on another way by upstream. Changelog: 62.0: https://github.com/linux-rdma/rdma-core/releases/tag/v62.0 61.0: https://github.com/linux-rdma/rdma-core/releases/tag/v61.0 60.0: https://github.com/linux-rdma/rdma-core/releases/tag/v60.0 59.0: https://github.com/linux-rdma/rdma-core/releases/tag/v59.0 58.0: https://github.com/linux-rdma/rdma-core/releases/tag/v58.0 57.0: https://github.com/linux-rdma/rdma-core/releases/tag/v57.0 56.0: https://github.com/linux-rdma/rdma-core/releases/tag/v56.0 55.0: https://github.com/linux-rdma/rdma-core/releases/tag/v55.0 54.0: https://github.com/linux-rdma/rdma-core/releases/tag/v54.0 53.0: https://github.com/linux-rdma/rdma-core/releases/tag/v53.0 52.0: https://github.com/linux-rdma/rdma-core/releases/tag/v52.0 Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
parent
2b444cfaa4
commit
9df85b55dc
@ -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")
|
||||
|
||||
@ -1,58 +0,0 @@
|
||||
From ae6adc4c748e67919fdf8ae1d44c619ee104c271 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
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 <raj.khem@gmail.com>
|
||||
---
|
||||
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 <libgen.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
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 <endian.h>
|
||||
#include <getopt.h>
|
||||
+#include <libgen.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <stdio.h>
|
||||
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 <config.h>
|
||||
|
||||
+#include <libgen.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
--
|
||||
2.44.0
|
||||
|
||||
@ -1,38 +0,0 @@
|
||||
From c7de6834f0cd92b7341ab17a5c6996f3fbd40140 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
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 <raj.khem@gmail.com>
|
||||
---
|
||||
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;
|
||||
@ -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"
|
||||
Loading…
x
Reference in New Issue
Block a user