Rebase to upstream release v27.0

Signed-off-by: Honggang Li <honli@redhat.com>
This commit is contained in:
Honggang Li 2019-12-12 20:48:45 -05:00
parent b631ce4665
commit f0a64cacc2
3 changed files with 18 additions and 13 deletions

1
.gitignore vendored
View File

@ -5,3 +5,4 @@
/rdma-core-16.2.tar.gz
/rdma-core-20.1.tar.gz
/rdma-core-26.1.tar.gz
/rdma-core-27.0.tar.gz

View File

@ -1,5 +1,5 @@
Name: rdma-core
Version: 26.1
Version: 27.0
Release: 1%{?dist}
Summary: RDMA core userspace libraries and daemons
@ -29,13 +29,13 @@ BuildRequires: systemd-devel
BuildRequires: python3-devel
BuildRequires: python3-Cython
%else
%if 0%{?rhel} == 8 || 0%{?fedora} >= 30
%if 0%{?rhel} >= 8 || 0%{?fedora} >= 30
BuildRequires: python3
%else
BuildRequires: python
%endif
%endif
%if 0%{?fedora} >= 21
%if 0%{?fedora} >= 21 || 0%{?rhel} >= 8
BuildRequires: perl-generators
%endif
@ -50,7 +50,7 @@ ExcludeArch: %{arm}
# Since we recommend developers use Ninja, so should packagers, for consistency.
%define CMAKE_FLAGS %{nil}
%if 0%{?fedora} >= 23
%if 0%{?fedora} >= 23 || 0%{?rhel} >= 8
# Ninja was introduced in FC23
BuildRequires: ninja-build
%define CMAKE_FLAGS -GNinja
@ -63,8 +63,8 @@ BuildRequires: make
%define cmake_install DESTDIR=%{buildroot} make install
%endif
%if 0%{?fedora} >= 25
# pandoc was introduced in FC25
%if 0%{?fedora} >= 25 || 0%{?rhel} >= 8
# pandoc was introduced in FC25, Centos8
BuildRequires: pandoc
%endif
@ -106,6 +106,7 @@ RDMA core development libraries and headers.
%package -n infiniband-diags
Summary: InfiniBand Diagnostic Tools
Requires: libibumad = %{version}-%{release}
Provides: perl(IBswcountlimits)
Provides: libibmad = %{version}-%{release}
Obsoletes: libibmad < %{version}-%{release}
@ -129,8 +130,6 @@ compatibility reasons.
Summary: A library and drivers for direct userspace use of RDMA (InfiniBand/iWARP/RoCE) hardware
%{?systemd_requires}
Requires: %{name}%{?_isa} = %{version}-%{release}
Provides: libcxgb3 = %{version}-%{release}
Obsoletes: libcxgb3 < %{version}-%{release}
Provides: libcxgb4 = %{version}-%{release}
Obsoletes: libcxgb4 < %{version}-%{release}
Provides: libefa = %{version}-%{release}
@ -147,8 +146,6 @@ Provides: libmlx5 = %{version}-%{release}
Obsoletes: libmlx5 < %{version}-%{release}
Provides: libmthca = %{version}-%{release}
Obsoletes: libmthca < %{version}-%{release}
Provides: libnes = %{version}-%{release}
Obsoletes: libnes < %{version}-%{release}
Provides: libocrdma = %{version}-%{release}
Obsoletes: libocrdma < %{version}-%{release}
Provides: librxe = %{version}-%{release}
@ -163,7 +160,6 @@ fast path operations.
Device-specific plug-in ibverbs userspace drivers are included:
- libcxgb3: Chelsio T3 iWARP HCA
- libcxgb4: Chelsio T4 iWARP HCA
- libefa: Amazon Elastic Fabric Adapter
- libhfi1: Intel Omni-Path HFI
@ -173,7 +169,6 @@ Device-specific plug-in ibverbs userspace drivers are included:
- libmlx4: Mellanox ConnectX-3 InfiniBand HCA
- libmlx5: Mellanox Connect-IB/X-4+ InfiniBand HCA
- libmthca: Mellanox InfiniBand HCA
- libnes: NetEffect RNIC
- libocrdma: Emulex OneConnect RDMA/RoCE Device
- libqedr: QLogic QL4xxx RoCE HCA
- librxe: A software implementation of the RoCE protocol
@ -343,6 +338,11 @@ rm -f %{buildroot}/%{_sbindir}/srp_daemon.sh
%ldconfig_scriptlets -n librdmacm
%post -n rdma-core
/sbin/udevadm trigger --subsystem-match=infiniband --action=change || true
/sbin/udevadm trigger --subsystem-match=net --action=change || true
/sbin/udevadm trigger --subsystem-match=infiniband_mad --action=change || true
%post -n ibacm
%systemd_post ibacm.service
%preun -n ibacm
@ -636,9 +636,13 @@ rm -f %{buildroot}/%{_sbindir}/srp_daemon.sh
%if %{with_pyverbs}
%files -n python3-pyverbs
%{python3_sitearch}/pyverbs
%{_docdir}/%{name}-%{version}/tests/*.py
%endif
%changelog
* Thu Dec 12 2019 Honggang Li <honli@redhat.com> - 27.0-1
- Rebase to upstream release v27.0
* Thu Nov 28 2019 Honggang Li <honli@redhat.com> - 26.1-1
- Rebase to upstream release v26.1

View File

@ -1 +1 @@
SHA512 (rdma-core-26.1.tar.gz) = 872c5fade0b184c17f740e8db566972e711fb4d51d74eb4a11bbaf685ad2fd455d97feb595f892a9436b839b594983d9364dcc981ca89651e9f0a178d9b0a901
SHA512 (rdma-core-27.0.tar.gz) = cf529867fbbd65562047d3e5b21d1f1c37835ad478b1209ac4bc9533d09834c0c9683ea9658b0ea5c794821419216d901f043e74e3c83494627e3a55ef849405