msg/async/rdma: compile with rdma as default

Issue: 992583
Issue: 992580

Change-Id: I24128b87294d3083c44c934f7d4bed554dd1f8a4
Signed-off-by: DanielBar-On <danielbo@mellanox.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e6b7ffb79091d9b7a3957a77fc7afc30af622936..2d3c11e2290eb5a532a8e86db39dff9e300ed801 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -173,7 +173,7 @@ else(ENABLE_SHARED)
 endif(ENABLE_SHARED)
 set(CMAKE_POSITION_INDEPENDENT_CODE ${ENABLE_SHARED})
 
-option(WITH_RDMA "Enable RDMA in async messenger" OFF)
+option(WITH_RDMA "Enable RDMA in async messenger" ON)
 if(WITH_RDMA)
   find_package(rdma REQUIRED)
   set(HAVE_RDMA ${RDMA_FOUND})

diff --git a/ceph.spec.in b/ceph.spec.in
index 404fe28981283f6a339477cef35af8dae9431eb3..73436e7c38587d0e98ecbe3e25150772aaa5f30a 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -132,6 +132,7 @@ BuildRequires:      xfsprogs
 BuildRequires: xfsprogs-devel
 BuildRequires: xmlstarlet
 BuildRequires: yasm
+BuildRequires: libibverbs-devel
 
 #################################################################################
 # distro-conditional dependencies

diff --git a/debian/control b/debian/control
index 8d82fa69e519bfd3cfb10690f28fb5b269fe04b5..1ae3a8a7662c1c8ee0591dedcf5dd99b54897d0c 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -33,6 +33,7 @@ Build-Depends: bc,
                libfcgi-dev,
                libfuse-dev,
                libgoogle-perftools-dev [i386 amd64 arm64],
+               libibverbs-dev,
                libkeyutils-dev,
                libleveldb-dev,
                libnss3-dev,