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
	debian/control
	run-make-check.sh
- disable SPDK for nautilus, even in run-make-check.sh, since the feature is not
  being used in production

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4e187f261bc4a22c03c3d35115092bca46036fb7..8ae89978d715861ba0bb81ca8148ef522e129322 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -267,11 +267,7 @@ if(WITH_BLUESTORE)
   endif()
 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 73e2006473e38aad75b6d2cda1d9c71a30f23f92..676c152bfc69c3c81f3387a49f1e7f6e30868fa8 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -169,7 +169,6 @@ BuildRequires:      libudev-devel
 BuildRequires: liboath-devel
 BuildRequires: libtool
 BuildRequires: libxml2-devel
-BuildRequires: libuuid-devel
 BuildRequires: make
 BuildRequires: ncurses-devel
 BuildRequires: parted
@@ -193,6 +192,7 @@ BuildRequires:  librabbitmq-devel
 %endif
 %if 0%{with make_check}
 BuildRequires:  jq
+BuildRequires: libuuid-devel
 BuildRequires: python%{_python_buildid}-bcrypt
 BuildRequires: python%{_python_buildid}-coverage
 BuildRequires: python%{_python_buildid}-nose

diff --git a/debian/control b/debian/control
index b073073ba137eed5f50bc4fff490fec510c664d7..a63444d7b6ba2d8c45280c8d8165ad9ce0e03dbd 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -69,7 +69,7 @@ Build-Depends: cmake (>= 3.5),
                python3-all-dev,
                python3-setuptools,
 # Make-Check   socat,
-               uuid-dev,
+# Make-Check   uuid-dev,
                uuid-runtime,
                valgrind,
                virtualenv | python-virtualenv,