From 1681a4881e53c6932b576c54d455043da7ec99bf Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Mon, 19 Aug 2019 15:21:06 +0800 Subject: [PATCH] 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 (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 --- CMakeLists.txt | 6 +----- ceph.spec.in | 2 +- debian/control | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d1dd93bd64d03..a0604177b2967 100644 --- 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 ee82e9cb01b2e..accb9434b87e2 100644 --- 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 56df3057f90b6..eb4d46dc34c70 100644 --- 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, -- 2.39.5