From 5f1a88238c9f74f5a9ddf437cec22bc5f71b49a9 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Tue, 12 Nov 2024 10:40:55 +0000 Subject: [PATCH] import UBI rdma-core-51.0-1.el9 --- .gitignore | 2 +- .rdma-core.metadata | 2 +- ...le-providers-that-were-not-enabled-i.patch | 50 ------------------- SPECS/rdma-core.spec | 13 +++-- 4 files changed, 12 insertions(+), 55 deletions(-) delete mode 100644 SOURCES/0003-CMakeLists-disable-providers-that-were-not-enabled-i.patch diff --git a/.gitignore b/.gitignore index f2f7af0..00c3bb9 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/rdma-core-48.0.tar.gz +SOURCES/rdma-core-51.0.tar.gz diff --git a/.rdma-core.metadata b/.rdma-core.metadata index faa4c71..973ade8 100644 --- a/.rdma-core.metadata +++ b/.rdma-core.metadata @@ -1 +1 @@ -b5e5f57b1f5269213cbd088f83212e0f03b17a60 SOURCES/rdma-core-48.0.tar.gz +38c8fb4cfd3efb73d91d75b43cbf13e051d2044f SOURCES/rdma-core-51.0.tar.gz diff --git a/SOURCES/0003-CMakeLists-disable-providers-that-were-not-enabled-i.patch b/SOURCES/0003-CMakeLists-disable-providers-that-were-not-enabled-i.patch deleted file mode 100644 index 2777f66..0000000 --- a/SOURCES/0003-CMakeLists-disable-providers-that-were-not-enabled-i.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 214c673b2a66a0ceb86a21ddb8cd7beba86cc6f3 Mon Sep 17 00:00:00 2001 -From: Michal Schmidt -Date: Wed, 1 Feb 2023 15:24:23 +0100 -Subject: [PATCH] CMakeLists: disable providers that were not enabled in RHEL - 9.1 - -Doing a package rebase, but don't want to enable additional drivers -unless explicitly requested. - -Upstream Status: RHEL only - -Signed-off-by: Michal Schmidt ---- - CMakeLists.txt | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9b7462861012..cfe79bcfacf3 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -711,7 +711,7 @@ add_subdirectory(providers/bnxt_re) - add_subdirectory(providers/cxgb4) # NO SPARSE - add_subdirectory(providers/efa) - add_subdirectory(providers/efa/man) --add_subdirectory(providers/erdma) -+#add_subdirectory(providers/erdma) - add_subdirectory(providers/hns) - add_subdirectory(providers/irdma) - add_subdirectory(providers/mana) -@@ -720,14 +720,14 @@ add_subdirectory(providers/mlx4) - add_subdirectory(providers/mlx4/man) - add_subdirectory(providers/mlx5) - add_subdirectory(providers/mlx5/man) --add_subdirectory(providers/mthca) --add_subdirectory(providers/ocrdma) -+#add_subdirectory(providers/mthca) -+#add_subdirectory(providers/ocrdma) - add_subdirectory(providers/qedr) - add_subdirectory(providers/vmw_pvrdma) - endif() - - add_subdirectory(providers/hfi1verbs) --add_subdirectory(providers/ipathverbs) -+#add_subdirectory(providers/ipathverbs) - add_subdirectory(providers/rxe) - add_subdirectory(providers/rxe/man) - add_subdirectory(providers/siw) --- -2.40.1 - diff --git a/SPECS/rdma-core.spec b/SPECS/rdma-core.spec index 585986c..6fef177 100644 --- a/SPECS/rdma-core.spec +++ b/SPECS/rdma-core.spec @@ -1,5 +1,5 @@ Name: rdma-core -Version: 48.0 +Version: 51.0 Release: 1%{?dist} Summary: RDMA core userspace libraries and daemons @@ -10,7 +10,6 @@ Summary: RDMA core userspace libraries and daemons License: GPLv2 or BSD Url: https://github.com/linux-rdma/rdma-core Source: https://github.com/linux-rdma/rdma-core/releases/download/v%{version}/%{name}-%{version}.tar.gz -Patch9000: 0003-CMakeLists-disable-providers-that-were-not-enabled-i.patch Patch9998: 9998-kernel-boot-Do-not-perform-device-rename-on-OPA-devi.patch Patch9999: 9999-udev-keep-NAME_KERNEL-as-default-interface-naming-co.patch # Do not build static libs by default. @@ -271,7 +270,6 @@ easy, object-oriented access to IB verbs. %patch9998 -p1 %endif %if 0%{?rhel} -%patch9000 -p1 %patch9999 -p1 %endif @@ -398,6 +396,7 @@ fi %config(noreplace) %{_sysconfdir}/rdma/modules/roce.conf %dir %{_sysconfdir}/modprobe.d %config(noreplace) %{_sysconfdir}/modprobe.d/mlx4.conf +%config(noreplace) %{_sysconfdir}/modprobe.d/truescale.conf %{_unitdir}/rdma-hw.target %{_unitdir}/rdma-load-modules@.service %dir %{dracutlibdir} @@ -415,6 +414,7 @@ fi %dir %{sysmodprobedir} %{sysmodprobedir}/libmlx4.conf %{_libexecdir}/mlx4-setup.sh +%{_libexecdir}/truescale-serdes.cmds %{_sbindir}/rdma-ndd %{_unitdir}/rdma-ndd.service %{_mandir}/man7/rxe* @@ -433,6 +433,7 @@ fi %{_libdir}/lib*.so %{_libdir}/pkgconfig/*.pc %{_mandir}/man3/efadv* +%{_mandir}/man3/hnsdv* %{_mandir}/man3/ibv_* %{_mandir}/man3/rdma* %{_mandir}/man3/umad* @@ -442,6 +443,7 @@ fi %{_mandir}/man3/mlx4dv* %{_mandir}/man3/manadv* %{_mandir}/man7/efadv* +%{_mandir}/man7/hnsdv* %{_mandir}/man7/mlx5dv* %{_mandir}/man7/mlx4dv* %{_mandir}/man7/manadv* @@ -519,6 +521,7 @@ fi %dir %{_sysconfdir}/libibverbs.d %dir %{_libdir}/libibverbs %{_libdir}/libefa.so.* +%{_libdir}/libhns.so.* %{_libdir}/libibverbs*.so.* %{_libdir}/libibverbs/*.so %{_libdir}/libmana.so.* @@ -615,6 +618,10 @@ fi %endif %changelog +* Mon Apr 22 2024 Kamal Heib - 51.0-1 +- Rebase to upstream release v51.0 +- Resolves: RHEL-24473, RHEL-23180 + * Mon Sep 18 2023 Kamal Heib - 48.0-1 - Rebase to upstream release v48.0 - Resolves: RHEL-884, RHEL-4800, RHEL-4799, RHEL-3527, RHEL-5486