From 6a84270897f35adca37c304cc06d80ec849b1dea Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Tue, 22 Aug 2017 10:15:42 -0400 Subject: 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: 1483997 Signed-off-by: Kaleb S. KEITHLEY Reviewed-on: https://review.gluster.org/18090 Smoke: Gluster Build System CentOS-regression: Gluster Build System Reviewed-by: Niels de Vos --- glusterfs.spec.in | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'glusterfs.spec.in') diff --git a/glusterfs.spec.in b/glusterfs.spec.in index 812ddf8095d..87fb390bbe7 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -22,7 +22,7 @@ %{?_without_rdma:%global _without_rdma --disable-ibverbs} # No RDMA Support on s390(x) -%ifarch s390 s390x +%ifarch s390 s390x armv7hl %global _without_rdma --disable-ibverbs %endif @@ -477,8 +477,12 @@ Obsoletes: python-gluster < 3.10 %package rdma Summary: GlusterFS rdma support for ib-verbs Group: Applications/File +%if ( 0%{?fedora} && 0%{?fedora} > 26 ) +BuildRequires: rdma-core-devel +%else BuildRequires: libibverbs-devel BuildRequires: librdmacm-devel >= 1.0.15 +%endif Requires: %{name}%{?_isa} = %{version}-%{release} %description rdma @@ -1318,6 +1322,9 @@ exit 0 %endif %changelog +* Tue Aug 22 2017 Kaleb S. KEITHLEY +- libibverbs-devel, librdmacm-devel -> rdma-core-devel #1483995 + * Wed Jul 12 2017 Kaleb S. KEITHLEY - selinux enable, disable ganesha_access_fuse %%trigger, %%triggerun -- cgit