From: Nathan Cutler <ncutler@suse.com>
Date: Thu, 20 Jul 2017 11:41:29 +0000 (+0200)
Subject: Revert "Test-enable XIO messenger and IB/RDMA support"
X-Git-Tag: v12.1.2~182^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=c21a9f24f43067442fc5f180f85b369b108f49d7;p=ceph-ci.git

Revert "Test-enable XIO messenger and IB/RDMA support"

This reverts commit 71cbc832ded17212d840afa709700a2ca1a498b9.

Signed-off-by: Nathan Cutler <ncutler@suse.com>

Conflicts:
	ceph.spec.in (trivial resolution)
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 0460a305947..2725216f57f 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -22,7 +22,6 @@
 %bcond_without ceph_test_package
 %endif
 %bcond_with make_check
-%bcond_with xio
 %ifarch s390 s390x
 %bcond_with tcmalloc
 %else
@@ -218,10 +217,6 @@ BuildRequires:	expat-devel
 %if 0%{?fedora} || 0%{?rhel}
 BuildRequires:  redhat-rpm-config
 %endif
-# Accelio IB/RDMA
-%if 0%{with xio}
-BuildRequires:  libxio-devel
-%endif
 
 %description
 Ceph is a massively scalable, open-source, distributed storage system that runs
@@ -258,9 +253,6 @@ Requires:      which
 %if 0%{?suse_version}
 Recommends:    ntp-daemon
 %endif
-%if 0%{with xio}
-Requires:      libxio
-%endif
 %description base
 Base is the package that includes all the files shared amongst ceph servers
 
@@ -287,9 +279,6 @@ Requires:	python-requests
 %if 0%{?suse_version}
 Requires(pre):	pwdutils
 %endif
-%if 0%{with xio}
-Requires:       libxio
-%endif
 %description -n ceph-common
 Common utilities to mount and interact with a ceph storage cluster.
 Comprised of files that are common to Ceph clients and servers.
@@ -831,9 +820,6 @@ cmake .. \
 %if 0%{?rhel} && ! 0%{?centos}
     -DWITH_SUBMAN=ON \
 %endif
-%if 0%{with xio}
-    -DWITH_XIO=ON \
-%endif
 %if 0%{without ceph_test_package}
     -DWITH_TESTS=OFF \
 %endif