From 15718e543f215fc4d0f23f6a10a5e43ade491b21 Mon Sep 17 00:00:00 2001 From: Ricardo Dias Date: Tue, 23 Aug 2016 13:36:55 +0200 Subject: [PATCH] rpm: Added ceph_test_package bcond flag to control the build of ceph-test package Fixes: http://tracker.ceph.com/issues/16776 Signed-off-by: Ricardo Dias --- ceph.spec.in | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/ceph.spec.in b/ceph.spec.in index babb02b63c8931..71636e8a0673a6 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -16,6 +16,11 @@ # %bcond_with ocf %bcond_without cephfs_java +%if 0%{?suse_version} +%bcond_with ceph_test_package +%else +%bcond_without ceph_test_package +%endif %bcond_with make_check %bcond_with xio %ifnarch s390 s390x @@ -560,6 +565,7 @@ well as the RESTful interface. These have to do with querying the daemons for command-description information, validating user command input against those descriptions, and submitting the command to the appropriate daemon. +%if 0%{with ceph_test_package} %package -n ceph-test Summary: Ceph benchmarks and test tools Group: System Environment/Libraries @@ -568,6 +574,7 @@ Requires: ceph-common Requires: xmlstarlet %description -n ceph-test This package contains Ceph benchmarks and test tools. +%endif %if 0%{with cephfs_java} @@ -679,6 +686,9 @@ cmake .. \ %if 0%{with xio} -DWITH_XIO=ON \ %endif +%if 0%{without ceph_test_package} + -DWITH_TESTS=OFF \ +%endif %if 0%{with cephfs_java} -DWITH_CEPHFS_JAVA=ON \ %endif @@ -1391,6 +1401,8 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1 %{python3_sitelib}/__pycache__/ceph_daemon.cpython*.py* %endif +################################################################################# +%if 0%{with ceph_test_package} %files -n ceph-test %defattr(-,root,root,-) %{_bindir}/ceph-client-debug @@ -1426,6 +1438,7 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1 %{_mandir}/man8/ceph-debugpack.8* %dir %{_libdir}/ceph %{_libdir}/ceph/ceph-monstore-update-crush.sh +%endif %if 0%{with cephfs_java} %files -n libcephfs_jni1