From 33786c67ffd45c917d835312d7043bc29c13cfdd Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Dec 07 2021 18:57:09 +0000 Subject: import rdma-core-37.1-1.el9 --- diff --git a/.gitignore b/.gitignore index ca14e91..417ac9e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/rdma-core-35.0.tar.gz +SOURCES/rdma-core-37.1.tar.gz diff --git a/.rdma-core.metadata b/.rdma-core.metadata index d642dcc..bd00c22 100644 --- a/.rdma-core.metadata +++ b/.rdma-core.metadata @@ -1 +1 @@ -de4b0a7d11ba10b4d35687a6dce8d3d6a60df342 SOURCES/rdma-core-35.0.tar.gz +cdd206d938d6e3add2ed18c106e58a1db8b78912 SOURCES/rdma-core-37.1.tar.gz diff --git a/SPECS/rdma-core.spec b/SPECS/rdma-core.spec index 998ff39..3c34a8c 100644 --- a/SPECS/rdma-core.spec +++ b/SPECS/rdma-core.spec @@ -1,6 +1,6 @@ Name: rdma-core -Version: 35.0 -Release: 3%{?dist} +Version: 37.1 +Release: 1%{?dist} Summary: RDMA core userspace libraries and daemons # Almost everything is licensed under the OFA dual GPLv2, 2 Clause BSD license @@ -108,7 +108,6 @@ Obsoletes: libibumad-devel < %{version}-%{release} Requires: librdmacm%{?_isa} = %{version}-%{release} Provides: librdmacm-devel = %{version}-%{release} Obsoletes: librdmacm-devel < %{version}-%{release} -Requires: ibacm%{?_isa} = %{version}-%{release} Provides: ibacm-devel = %{version}-%{release} Obsoletes: ibacm-devel < %{version}-%{release} Requires: infiniband-diags%{?_isa} = %{version}-%{release} @@ -141,14 +140,6 @@ IB subnet. infiniband-diags now also provides libibmad. libibmad provides low layer IB functions for use by the IB diagnostic and management programs. These include MAD, SA, SMP, and other basic IB functions. -%package -n infiniband-diags-compat -Summary: OpenFabrics Alliance InfiniBand Diagnostic Tools - -%description -n infiniband-diags-compat -Deprecated scripts and utilities which provide duplicated functionality, most -often at a reduced performance. These are maintained for the time being for -compatibility reasons. - %package -n libibverbs Summary: A library and drivers for direct userspace use of RDMA (InfiniBand/iWARP/RoCE) hardware Provides: libcxgb4 = %{version}-%{release} @@ -157,18 +148,12 @@ Provides: libefa = %{version}-%{release} Obsoletes: libefa < %{version}-%{release} Provides: libhfi1 = %{version}-%{release} Obsoletes: libhfi1 < %{version}-%{release} -Provides: libi40iw = %{version}-%{release} -Obsoletes: libi40iw < %{version}-%{release} -Provides: libipathverbs = %{version}-%{release} -Obsoletes: libipathverbs < %{version}-%{release} +Provides: libirdma = %{version}-%{release} +Obsoletes: libirdma < %{version}-%{release} Provides: libmlx4 = %{version}-%{release} Obsoletes: libmlx4 < %{version}-%{release} Provides: libmlx5 = %{version}-%{release} Obsoletes: libmlx5 < %{version}-%{release} -Provides: libmthca = %{version}-%{release} -Obsoletes: libmthca < %{version}-%{release} -Provides: libocrdma = %{version}-%{release} -Obsoletes: libocrdma < %{version}-%{release} Provides: librxe = %{version}-%{release} Obsoletes: librxe < %{version}-%{release} %if 0%{?fedora} == 34 @@ -188,12 +173,9 @@ Device-specific plug-in ibverbs userspace drivers are included: - libefa: Amazon Elastic Fabric Adapter - libhfi1: Intel Omni-Path HFI - libhns: HiSilicon Hip06 SoC -- libi40iw: Intel Ethernet Connection X722 RDMA -- libipathverbs: QLogic InfiniPath HCA +- libirdma: Intel Ethernet Connection RDMA - libmlx4: Mellanox ConnectX-3 InfiniBand HCA - libmlx5: Mellanox Connect-IB/X-4+ InfiniBand HCA -- libmthca: Mellanox InfiniBand HCA -- libocrdma: Emulex OneConnect RDMA/RoCE Device - libqedr: QLogic QL4xxx RoCE HCA - librxe: A software implementation of the RoCE protocol - libsiw: A software implementation of the iWarp protocol @@ -209,6 +191,9 @@ displays information about RDMA devices. %package -n ibacm Summary: InfiniBand Communication Manager Assistant +%{?systemd_requires} +Requires: libibumad%{?_isa} = %{version}-%{release} +Requires: libibverbs%{?_isa} = %{version}-%{release} %description -n ibacm The ibacm daemon helps reduce the load of managing path record lookups on @@ -222,6 +207,7 @@ library knows how to talk directly to the ibacm daemon to retrieve data. %package -n iwpmd Summary: iWarp Port Mapper userspace daemon +%{?systemd_requires} %description -n iwpmd iwpmd provides a userspace service for iWarp drivers to claim @@ -237,6 +223,7 @@ are used by the IB diagnostic and management tools, including OpenSM. %package -n librdmacm Summary: Userspace RDMA Connection Manager +Requires: libibverbs%{?_isa} = %{version}-%{release} %description -n librdmacm librdmacm provides a userspace RDMA Communication Management API. @@ -244,6 +231,7 @@ librdmacm provides a userspace RDMA Communication Management API. %package -n librdmacm-utils Summary: Examples for the librdmacm library Requires: librdmacm%{?_isa} = %{version}-%{release} +Requires: libibverbs%{?_isa} = %{version}-%{release} %description -n librdmacm-utils Example test programs for the librdmacm library. @@ -253,6 +241,9 @@ Summary: Tools for using the InfiniBand SRP protocol devices Obsoletes: srptools <= 1.0.3 Provides: srptools = %{version}-%{release} Obsoletes: openib-srptools <= 0.0.6 +%{?systemd_requires} +Requires: libibumad%{?_isa} = %{version}-%{release} +Requires: libibverbs%{?_isa} = %{version}-%{release} %description -n srp_daemon In conjunction with the kernel ib_srp driver, srp_daemon allows you to @@ -262,6 +253,8 @@ discover and use SCSI devices via the SCSI RDMA Protocol over InfiniBand. %package -n python3-pyverbs Summary: Python3 API over IB verbs %{?python_provide:%python_provide python3-pyverbs} +Requires: librdmacm%{?_isa} = %{version}-%{release} +Requires: libibverbs%{?_isa} = %{version}-%{release} %description -n python3-pyverbs Pyverbs is a Cython-based Python API over libibverbs, providing an @@ -306,7 +299,7 @@ easy, object-oriented access to IB verbs. -DCMAKE_INSTALL_DOCDIR:PATH=%{_docdir}/%{name} \ -DCMAKE_INSTALL_UDEV_RULESDIR:PATH=%{_udevrulesdir} \ -DCMAKE_INSTALL_PERLDIR:PATH=%{perl_vendorlib} \ - -DENABLE_IBDIAGS_COMPAT:BOOL=True \ + -DENABLE_IBDIAGS_COMPAT:BOOL=False \ %if %{with_static} -DENABLE_STATIC=1 \ %endif @@ -351,6 +344,18 @@ install -D -m0644 redhat/rdma.conf %{buildroot}%{_sysconfdir}/rdma/modules/rdma. rm -rf %{buildroot}/%{_initrddir}/ rm -f %{buildroot}/%{_sbindir}/srp_daemon.sh +# Remove ibverbs provider libs we don't support +rm -f %{buildroot}/%{_libdir}/libibverbs/libcxgb3-rdmav*.so +rm -f %{buildroot}/%{_sysconfdir}/libibverbs.d/cxgb3.driver +rm -f %{buildroot}/%{_libdir}/libibverbs/libocrdma-rdmav*.so +rm -f %{buildroot}/%{_sysconfdir}/libibverbs.d/ocrdma.driver +rm -f %{buildroot}/%{_libdir}/libibverbs/libnes-rdmav*.so +rm -f %{buildroot}/%{_sysconfdir}/libibverbs.d/nes.driver +rm -f %{buildroot}/%{_libdir}/libibverbs/libmthca-rdmav*.so +rm -f %{buildroot}/%{_sysconfdir}/libibverbs.d/mthca.driver +rm -f %{buildroot}/%{_libdir}/libibverbs/libipathverbs-rdmav*.so +rm -f %{buildroot}/%{_sysconfdir}/libibverbs.d/ipathverbs.driver + %ldconfig_scriptlets -n libibverbs %ldconfig_scriptlets -n libibumad @@ -450,43 +455,6 @@ fi %{_mandir}/man7/mlx4dv* %{_mandir}/man3/ibnd_* -%files -n infiniband-diags-compat -%{_sbindir}/ibcheckerrs -%{_mandir}/man8/ibcheckerrs* -%{_sbindir}/ibchecknet -%{_mandir}/man8/ibchecknet* -%{_sbindir}/ibchecknode -%{_mandir}/man8/ibchecknode* -%{_sbindir}/ibcheckport -%{_mandir}/man8/ibcheckport.* -%{_sbindir}/ibcheckportwidth -%{_mandir}/man8/ibcheckportwidth* -%{_sbindir}/ibcheckportstate -%{_mandir}/man8/ibcheckportstate* -%{_sbindir}/ibcheckwidth -%{_mandir}/man8/ibcheckwidth* -%{_sbindir}/ibcheckstate -%{_mandir}/man8/ibcheckstate* -%{_sbindir}/ibcheckerrors -%{_mandir}/man8/ibcheckerrors* -%{_sbindir}/ibdatacounts -%{_mandir}/man8/ibdatacounts* -%{_sbindir}/ibdatacounters -%{_mandir}/man8/ibdatacounters* -%{_sbindir}/ibdiscover.pl -%{_mandir}/man8/ibdiscover* -%{_sbindir}/ibswportwatch.pl -%{_mandir}/man8/ibswportwatch* -%{_sbindir}/ibqueryerrors.pl -%{_sbindir}/iblinkinfo.pl -%{_sbindir}/ibprintca.pl -%{_mandir}/man8/ibprintca* -%{_sbindir}/ibprintswitch.pl -%{_mandir}/man8/ibprintswitch* -%{_sbindir}/ibprintrt.pl -%{_mandir}/man8/ibprintrt* -%{_sbindir}/set_nodedesc.sh - %files -n infiniband-diags %{_sbindir}/ibaddr %{_mandir}/man8/ibaddr* @@ -546,10 +514,6 @@ fi %{_mandir}/man8/dump_lfts* %{_sbindir}/dump_mfts.sh %{_mandir}/man8/dump_mfts* -%{_sbindir}/ibclearerrors -%{_mandir}/man8/ibclearerrors* -%{_sbindir}/ibclearcounters -%{_mandir}/man8/ibclearcounters* %{_sbindir}/ibstatus %{_mandir}/man8/ibstatus* %{_mandir}/man8/infiniband-diags* @@ -658,6 +622,10 @@ fi %endif %changelog +* Wed Oct 20 2021 Honggang Li - 37.1-1 +- Rebase to upstream release v37.1 +- Resolves: rhbz#1994803 + * Tue Aug 10 2021 Mohan Boddu - 35.0-3 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags Related: rhbz#1991688