|
|
|
@@ -127,7 +127,7 @@
|
|
|
|
|
# main package definition
|
|
|
|
|
#################################################################################
|
|
|
|
|
Name: ceph
|
|
|
|
|
Version: 16.2.7
|
|
|
|
|
Version: 16.2.10
|
|
|
|
|
Release: 1%{?dist}
|
|
|
|
|
%if 0%{?fedora} || 0%{?rhel}
|
|
|
|
|
Epoch: 2
|
|
|
|
@@ -139,7 +139,7 @@ Epoch: 2
|
|
|
|
|
|
|
|
|
|
Summary: User space components of the Ceph file system
|
|
|
|
|
#License: LGPL-2.1 and LGPL-3.0 and CC-BY-SA-3.0 and GPL-2.0 and BSL-1.0 and BSD-3-Clause and MIT
|
|
|
|
|
License: (LGPLv2.1 or LGPLv3) and CC-BY-SA-3.0 and GPLv2 and Boost-1.0 and BSD and MIT
|
|
|
|
|
License: (LGPLv2.1 or LGPLv3) and CC-BY-SA-3.0 and GPLv2 and Boost and BSD and MIT
|
|
|
|
|
%if 0%{?suse_version}
|
|
|
|
|
Group: System/Filesystems
|
|
|
|
|
%endif
|
|
|
|
@@ -151,7 +151,6 @@ Patch0007: 0007-src-test-neorados-CMakeLists.txt.patch
|
|
|
|
|
Patch0008: 0008-cmake-modules-Finduring.cmake.patch
|
|
|
|
|
Patch0014: 0014-rgw-Replace-boost-string_ref-view-with-std-string_vi.patch
|
|
|
|
|
Patch0015: 0015-src-kv-rocksdb_cache.patch
|
|
|
|
|
Patch0016: 0016-src-tracing-patch
|
|
|
|
|
# Source1: cmake-modules-BuildBoost.cmake.noautopatch
|
|
|
|
|
# ceph 14.0.1 does not support 32-bit architectures, bugs #1727788, #1727787
|
|
|
|
|
ExcludeArch: i686 armv7hl
|
|
|
|
@@ -346,10 +345,10 @@ BuildRequires: python%{python3_pkgversion}-sphinx
|
|
|
|
|
BuildRequires: lz4-devel >= 1.7
|
|
|
|
|
%endif
|
|
|
|
|
# distro-conditional make check dependencies
|
|
|
|
|
BuildRequires: golang
|
|
|
|
|
%if 0%{with make_check}
|
|
|
|
|
%if 0%{?fedora} || 0%{?rhel}
|
|
|
|
|
BuildRequires: golang-github-prometheus
|
|
|
|
|
BuildRequires: jsonnet
|
|
|
|
|
BuildRequires: libtool-ltdl-devel
|
|
|
|
|
BuildRequires: xmlsec1
|
|
|
|
|
BuildRequires: xmlsec1-devel
|
|
|
|
@@ -367,7 +366,6 @@ BuildRequires: python%{python3_pkgversion}-pyOpenSSL
|
|
|
|
|
%endif
|
|
|
|
|
%if 0%{?suse_version}
|
|
|
|
|
BuildRequires: golang-github-prometheus-prometheus
|
|
|
|
|
BuildRequires: jsonnet
|
|
|
|
|
BuildRequires: libxmlsec1-1
|
|
|
|
|
BuildRequires: libxmlsec1-nss1
|
|
|
|
|
BuildRequires: libxmlsec1-openssl1
|
|
|
|
@@ -1285,9 +1283,8 @@ export CEPH_MFLAGS_JOBS="-j$CEPH_SMP_NCPUS"
|
|
|
|
|
|
|
|
|
|
env | sort
|
|
|
|
|
|
|
|
|
|
mkdir build
|
|
|
|
|
cd build
|
|
|
|
|
%{cmake} .. \
|
|
|
|
|
mkdir -p %{_vpath_builddir}
|
|
|
|
|
%{cmake} \
|
|
|
|
|
-GNinja \
|
|
|
|
|
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
|
|
|
|
|
-DCMAKE_COLOR_MAKEFILE:BOOL=OFF \
|
|
|
|
@@ -1395,11 +1392,9 @@ export GCC_COLORS=
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%install
|
|
|
|
|
pushd build
|
|
|
|
|
%cmake_install
|
|
|
|
|
# we have dropped sysvinit bits
|
|
|
|
|
rm -f %{buildroot}/%{_sysconfdir}/init.d/ceph
|
|
|
|
|
popd
|
|
|
|
|
%if 0%{with seastar}
|
|
|
|
|
# package crimson-osd with the name of ceph-osd
|
|
|
|
|
install -m 0755 %{buildroot}%{_bindir}/crimson-osd %{buildroot}%{_bindir}/ceph-osd
|
|
|
|
@@ -1466,7 +1461,7 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-rbd
|
|
|
|
|
mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-rbd-mirror
|
|
|
|
|
|
|
|
|
|
# prometheus alerts
|
|
|
|
|
install -m 644 -D monitoring/prometheus/alerts/ceph_default_alerts.yml %{buildroot}/etc/prometheus/ceph/ceph_default_alerts.yml
|
|
|
|
|
install -m 644 -D monitoring/ceph-mixin/prometheus_alerts.yml %{buildroot}/etc/prometheus/ceph/ceph_default_alerts.yml
|
|
|
|
|
|
|
|
|
|
%if 0%{?suse_version}
|
|
|
|
|
# create __pycache__ directories and their contents
|
|
|
|
@@ -1573,8 +1568,7 @@ exit 0
|
|
|
|
|
|
|
|
|
|
%if ! 0%{?suse_version}
|
|
|
|
|
%postun -n cephadm
|
|
|
|
|
userdel -r cephadm || true
|
|
|
|
|
exit 0
|
|
|
|
|
[ $1 -ne 0 ] || userdel cephadm || :
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%files -n cephadm
|
|
|
|
@@ -1582,7 +1576,7 @@ exit 0
|
|
|
|
|
%{_mandir}/man8/cephadm.8*
|
|
|
|
|
%attr(0700,cephadm,cephadm) %dir %{_sharedstatedir}/cephadm
|
|
|
|
|
%attr(0700,cephadm,cephadm) %dir %{_sharedstatedir}/cephadm/.ssh
|
|
|
|
|
%attr(0600,cephadm,cephadm) %{_sharedstatedir}/cephadm/.ssh/authorized_keys
|
|
|
|
|
%config(noreplace) %attr(0600,cephadm,cephadm) %{_sharedstatedir}/cephadm/.ssh/authorized_keys
|
|
|
|
|
|
|
|
|
|
%files common
|
|
|
|
|
%dir %{_docdir}/ceph
|
|
|
|
@@ -2505,8 +2499,6 @@ exit 0
|
|
|
|
|
%endif
|
|
|
|
|
%attr(0755,root,root) %dir %{_sysconfdir}/grafana/dashboards/ceph-dashboard
|
|
|
|
|
%config %{_sysconfdir}/grafana/dashboards/ceph-dashboard/*
|
|
|
|
|
%doc monitoring/grafana/dashboards/README
|
|
|
|
|
%doc monitoring/grafana/README.md
|
|
|
|
|
|
|
|
|
|
%files prometheus-alerts
|
|
|
|
|
%if 0%{?suse_version}
|
|
|
|
@@ -2516,14 +2508,32 @@ exit 0
|
|
|
|
|
%config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
|
|
* Fri Jul 22 2022 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:16.2.10-1
|
|
|
|
|
- 16.2.10 GA
|
|
|
|
|
|
|
|
|
|
* Sun Jul 10 2022 Robert-André Mauchin <zebob.m@gmail.com> - 2:16.2.9-3
|
|
|
|
|
- Rebuild for CVE-2022-{24675,28327,29526 in golang}
|
|
|
|
|
|
|
|
|
|
* Wed Jun 22 2022 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:16.2.9-2
|
|
|
|
|
- 16.2.9, rhbz#2100237
|
|
|
|
|
|
|
|
|
|
* Thu May 19 2022 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:16.2.9-1
|
|
|
|
|
- 16.2.9 GA
|
|
|
|
|
|
|
|
|
|
* Tue May 17 2022 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:16.2.8-1
|
|
|
|
|
- 16.2.8 GA
|
|
|
|
|
|
|
|
|
|
* Wed Mar 9 2022 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:16.2.7-3
|
|
|
|
|
- 16.2.7, Boost license, rhbz#2061615
|
|
|
|
|
|
|
|
|
|
* Tue Dec 21 2021 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:16.2.7-2
|
|
|
|
|
- 16.2.7, rebuild with systemtap-4.6-4
|
|
|
|
|
|
|
|
|
|
* Tue Dec 7 2021 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:16.2.7-1
|
|
|
|
|
- 16.2.7 GA
|
|
|
|
|
|
|
|
|
|
* Tue Nov 02 2021 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2:16.2.6-3
|
|
|
|
|
- rebuild against new liblttng-ust
|
|
|
|
|
|
|
|
|
|
* Tue Oct 19 2021 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:16.2.6-2
|
|
|
|
|
- 16.2.6, rebuild with rocksdb 6.25
|
|
|
|
|
* Tue Sep 28 2021 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:16.2.6-2
|
|
|
|
|
- Rebuilt for rocksdb-6.22, again; forgot an override was needed
|
|
|
|
|
|
|
|
|
|
* Fri Sep 17 2021 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:16.2.6-1
|
|
|
|
|
- 16.2.6 GA
|
|
|
|
|
Kaleb S. KEITHLEY