Disable multiple build options

This commit is contained in:
Boris Ranto 2021-02-03 12:57:12 +01:00
parent d8ce392242
commit 21f459c426
1 changed files with 18 additions and 38 deletions

View File

@ -25,12 +25,8 @@
%bcond_with make_check %bcond_with make_check
%bcond_with zbd %bcond_with zbd
%bcond_with cmake_verbose_logging %bcond_with cmake_verbose_logging
%bcond_without ceph_test_package %bcond_with ceph_test_package
%ifarch s390 s390x
%bcond_with tcmalloc %bcond_with tcmalloc
%else
%bcond_without tcmalloc
%endif
%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel}
%bcond_without selinux %bcond_without selinux
@ -39,28 +35,12 @@
%else %else
%bcond_without cephfs_java %bcond_without cephfs_java
%endif %endif
%bcond_without amqp_endpoint
%bcond_without kafka_endpoint
%bcond_without lttng
%bcond_without libradosstriper
%bcond_without ocf
%global _remote_tarball_prefix https://download.ceph.com/tarballs/
%endif
%if 0%{?suse_version}
%bcond_with amqp_endpoint %bcond_with amqp_endpoint
%bcond_with cephfs_java
%bcond_with kafka_endpoint %bcond_with kafka_endpoint
%ifarch x86_64 aarch64 ppc64le
%bcond_without lttng
%else
%bcond_with lttng %bcond_with lttng
%endif %bcond_with libradosstriper
%bcond_with ocf %bcond_with ocf
%bcond_with selinux %global _remote_tarball_prefix https://download.ceph.com/tarballs/
#Compat macro for _fillupdir macro introduced in Nov 2017
%if ! %{defined _fillupdir}
%global _fillupdir /var/adm/fillup-templates
%endif
%endif %endif
%bcond_with seastar %bcond_with seastar
%bcond_with jaeger %bcond_with jaeger
@ -86,19 +66,6 @@
%endif %endif
%endif %endif
%if 0%{?suse_version}
%if !0%{?is_opensuse}
# SLE does not support luarocks
%bcond_with lua_packages
%else
%global luarocks_package_name lua53-luarocks
%bcond_without lua_packages
%endif
%else
%global luarocks_package_name luarocks
%bcond_without lua_packages
%endif
%{!?_udevrulesdir: %global _udevrulesdir /lib/udev/rules.d} %{!?_udevrulesdir: %global _udevrulesdir /lib/udev/rules.d}
%{!?tmpfiles_create: %global tmpfiles_create systemd-tmpfiles --create} %{!?tmpfiles_create: %global tmpfiles_create systemd-tmpfiles --create}
%{!?python3_pkgversion: %global python3_pkgversion 3} %{!?python3_pkgversion: %global python3_pkgversion 3}
@ -113,7 +80,7 @@
################################################################################# #################################################################################
Name: ceph Name: ceph
Version: 16.1.0 Version: 16.1.0
Release: 0.1.snapshot%{?dist} Release: 0.2.snapshot%{?dist}
%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel}
Epoch: 2 Epoch: 2
%endif %endif
@ -1244,9 +1211,19 @@ cd build
-DCMAKE_INSTALL_DOCDIR=%{_docdir}/ceph \ -DCMAKE_INSTALL_DOCDIR=%{_docdir}/ceph \
-DCMAKE_INSTALL_INCLUDEDIR=%{_includedir} \ -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir} \
-DCMAKE_INSTALL_SYSTEMD_SERVICEDIR=%{_unitdir} \ -DCMAKE_INSTALL_SYSTEMD_SERVICEDIR=%{_unitdir} \
-DWITH_MGR=OFF \
-DWITH_EMBEDDED=OFF \
-DWITH_MANPAGE=ON \ -DWITH_MANPAGE=ON \
-DWITH_PYTHON3=%{python3_version} \ -DWITH_PYTHON3=%{python3_version} \
-DWITH_MGR_DASHBOARD_FRONTEND=OFF \ -DWITH_MGR_DASHBOARD_FRONTEND=OFF \
-DWITH_SYSTEMD=ON \
-DWITH_SYSTEM_BOOST=ON \
-DWITH_SPDK=OFF \
-DWITH_PMEM=OFF \
-DWITH_BLUESTORE=OFF \
-DWITH_BOOST_CONTEXT=OFF \
-DWITH_LEVELDB=OFF \
-DWITH_RADOSGW=OFF \
%if 0%{without ceph_test_package} %if 0%{without ceph_test_package}
-DWITH_TESTS=OFF \ -DWITH_TESTS=OFF \
%endif %endif
@ -1306,7 +1283,7 @@ cd build
%if 0%{with ceph_test_package} %if 0%{with ceph_test_package}
-DWITH_SYSTEM_GTEST=ON \ -DWITH_SYSTEM_GTEST=ON \
%endif %endif
-DWITH_GRAFANA=ON -DWITH_GRAFANA=OFF
%if %{with cmake_verbose_logging} %if %{with cmake_verbose_logging}
cat ./CMakeFiles/CMakeOutput.log cat ./CMakeFiles/CMakeOutput.log
@ -2415,6 +2392,9 @@ exit 0
%config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml %config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml
%changelog %changelog
* Fri Jan 29 2021 Boris Ranto <branto[at]redhat.com> - 2:16.1.0-0.2.snapshot
- disable multiple build options
* Fri Jan 29 2021 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:16.1.0-0.1.snapshot * Fri Jan 29 2021 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:16.1.0-0.1.snapshot
- ceph 16.1.0 RC (ceph-16.1.0-43-g6b74fb5c) - ceph 16.1.0 RC (ceph-16.1.0-43-g6b74fb5c)