packaging: use rdma-core(-devel) instead of ibverbs, rdmacm

Also disable rdma on armv7hl.

Starting in Fedora 26 the rdma-core package replaces various
(lib)ibverbs and (lib)rdmacm packages.

Also apparently rdma never actually worked (even if ibverbs and
rdmacm packages were built) for armv7hl. The new rdma-core excludes
armv7hl.

See https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/WJHXQ3G6H7UMVERDCMUXBYDJTFABTGW3/
and https://bugzilla.redhat.com/show_bug.cgi?id=1483278

Even though rdma-core dates back to Fedora 26 this only makes the
switch to rdma-core effective with Fedora 27 and later; rdma-core has
Provides: (and Obsoletes:) for all the ibverbs and rdmacm packages
which is why we haven't noticed this before now.

Change-Id: I3cd4f2becb465569b2c8e5514d28c9adff534d26
BUG: 1483995
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
Reviewed-on: https://review.gluster.org/18088
Smoke: Gluster Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Niels de Vos <ndevos@redhat.com>
This commit is contained in:
Kaleb S. KEITHLEY 2017-08-22 10:21:48 -04:00 committed by Niels de Vos
parent 5f3ff9b33c
commit 2c1ddc55d1

View File

@ -26,7 +26,7 @@
%{?_without_rdma:%global _without_rdma --disable-ibverbs} %{?_without_rdma:%global _without_rdma --disable-ibverbs}
# No RDMA Support on s390(x) # No RDMA Support on s390(x)
%ifarch s390 s390x %ifarch s390 s390x armv7hl
%global _without_rdma --disable-ibverbs %global _without_rdma --disable-ibverbs
%endif %endif
@ -479,8 +479,12 @@ Obsoletes: python-gluster < 3.10
%package rdma %package rdma
Summary: GlusterFS rdma support for ib-verbs Summary: GlusterFS rdma support for ib-verbs
Group: Applications/File Group: Applications/File
%if ( 0%{?fedora} && 0%{?fedora} > 26 )
BuildRequires: rdma-core-devel
%else
BuildRequires: libibverbs-devel BuildRequires: libibverbs-devel
BuildRequires: librdmacm-devel >= 1.0.15 BuildRequires: librdmacm-devel >= 1.0.15
%endif
Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
%description rdma %description rdma
@ -1375,6 +1379,9 @@ exit 0
%endif %endif
%changelog %changelog
* Tue Aug 22 2017 Kaleb S. KEITHLEY <kkeithle@redhat.com>
- libibverbs-devel, librdmacm-devel -> rdma-core-devel #1483995
* Thu Jul 20 2017 Aravinda VK <avishwan@redhat.com> * Thu Jul 20 2017 Aravinda VK <avishwan@redhat.com>
- Added new tool/binary to set the gfid2path xattr on files - Added new tool/binary to set the gfid2path xattr on files