Skip to content

Commit

Permalink
rpm: Added ceph_test_package bcond flag to control the build of ceph-…
Browse files Browse the repository at this point in the history
…test package

Fixes: http://tracker.ceph.com/issues/16776

Signed-off-by: Ricardo Dias <rdias@suse.com>
  • Loading branch information
rjfd committed Aug 26, 2016
1 parent 0da3155 commit 15718e5
Showing 1 changed file with 13 additions and 0 deletions.
13 changes: 13 additions & 0 deletions ceph.spec.in
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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}

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 15718e5

Please sign in to comment.