cmake,run-make-check.sh,deb,rpm: disable SPDK by default

but we still enable it in `run-make-check.sh`

* cmake: disable SPDK by default
* run-make-check.sh: enable WITH_SPDK so at least we can ensure it
  builds
* deb,rpm: add uuid-dev / libuuid-devel as a "make check" dependency

Fixes: https://tracker.ceph.com/issues/41330
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 3234fb3982483d43a23df902628178566128b7b4)

Conflicts:
        CMakeLists.txt
	ceph.spec.in
	debian/control
	run-make-check.sh
- disable SPDK for mimic, even in run-make-check.sh, since the feature is not
  being used in production

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d1dd93bd64d03dea330fc22dd309056801ac2533..a0604177b296716f548598d8e68203db4c05cb9c 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -229,11 +229,7 @@ if(WITH_BLUESTORE)
   set(HAVE_LIBAIO ${AIO_FOUND})
 endif()
 
-if(CMAKE_SYSTEM_PROCESSOR MATCHES "i386|i686|amd64|x86_64|AMD64|aarch64")
-  option(WITH_SPDK "Enable SPDK" ON)
-else()
-  option(WITH_SPDK "Enable SPDK" OFF)
-endif()
+option(WITH_SPDK "Enable SPDK" OFF)
 if(WITH_SPDK)
   if(NOT WITH_BLUESTORE)
     message(SEND_ERROR "Please enable WITH_BLUESTORE for using SPDK")

diff --git a/ceph.spec.in b/ceph.spec.in
index ee82e9cb01b2ec79f13388d7ed7be4651a32fb32..accb9434b87e2ec29ab0caa797be73f64306269f 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -158,7 +158,6 @@ BuildRequires:      libudev-devel
 BuildRequires: liboath-devel
 BuildRequires: libtool
 BuildRequires: libxml2-devel
-BuildRequires: libuuid-devel
 BuildRequires: make
 BuildRequires: parted
 BuildRequires: patch
@@ -177,6 +176,7 @@ BuildRequires:      xfsprogs-devel
 BuildRequires: xmlstarlet
 BuildRequires: yasm
 %if 0%{with make_check}
+#BuildRequires:        libuuid-devel
 BuildRequires: python%{_python_buildid}-coverage
 BuildRequires: python%{_python_buildid}-nose
 BuildRequires: python%{_python_buildid}-pecan

diff --git a/debian/control b/debian/control
index 56df3057f90b6c35cfca2c40d8ec23437126b7cf..eb4d46dc34c708f95e21e21f2f143f93cca22aa9 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -67,7 +67,7 @@ Build-Depends: bc,
                python3-all-dev,
                python3-setuptools,
                socat,
-               uuid-dev,
+#              uuid-dev,
                uuid-runtime,
                valgrind,
                virtualenv | python-virtualenv,