[glusterfs] - no InfiniBand on s390(x)

Dan Horák sharkcz at fedoraproject.org
Wed Jan 5 09:38:38 UTC 2011


commit cff0b00786870683e4b6096b110dfe1578d4b3b3
Author: Dan Horák <dan at danny.cz>
Date:   Wed Jan 5 10:38:23 2011 +0100

    - no InfiniBand on s390(x)

 glusterfs.spec |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletions(-)
---
diff --git a/glusterfs.spec b/glusterfs.spec
index 165e502..8449a5e 100644
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -1,8 +1,14 @@
 %global major_minor 3.1
 
+%ifarch s390 s390x
+%global with_ib 0
+%else
+%global with_ib 1
+%endif
+
 Name:             glusterfs
 Version:          %{major_minor}.1
-Release:          2%{?dist}
+Release:          3%{?dist}
 Summary:          Clustered file-system
 
 Group:            System Environment/Base
@@ -48,6 +54,7 @@ This package includes the glusterfs binary, the glusterfsd daemon and the
 gluster command line, libglusterfs and glusterfs translator modules common to
 both GlusterFS server and client framework.
 
+%if %{with_ib}
 %package rdma
 Summary:          Support for ib-verbs
 Group:            Applications/File
@@ -65,6 +72,7 @@ called Translators from GNU Hurd kernel. Much of the code in GlusterFS
 is in user space and easily manageable.
 
 This package provides support to ib-verbs library.
+%endif
 
 %package fuse
 Summary:          Fuse client
@@ -232,12 +240,16 @@ sed -i 's|option working-directory /etc/glusterd|option working-directory %{_sha
 %{_mandir}/man8/*glusterd.8*
 %{_mandir}/man8/*glusterfs-volgen.8*
 %dir %{_localstatedir}/log/glusterfs
+%if %{with_ib}
 %exclude %{_libdir}/glusterfs/%{version}/rpc-transport/rdma*
+%endif
 %exclude %{_libdir}/glusterfs/%{version}/xlator/mount/fuse*
 
+%if %{with_ib}
 %files rdma
 %defattr(-,root,root,-)
 %{_libdir}/glusterfs/%{version}/rpc-transport/rdma*
+%endif
 
 %files fuse
 %defattr(-,root,root,-)
@@ -299,6 +311,9 @@ if [ $1 -ge 1 ]; then
 fi
 
 %changelog
+* Wed Jan 5 2011 Dan Horák <dan[at]danny.cz> - 3.1.1-3
+- no InfiniBand on s390(x)
+
 * Sat Jan 1 2011 Jonathan Steffan <jsteffan at fedoraproject.org> - 3.1.1-2
 - Update to support readline
 - Update to not parallel build


More information about the scm-commits mailing list