From d5be4a1cc6c82dd0602383521c6e9aa59845e2f1 Mon Sep 17 00:00:00 2001 From: Kaleb S KEITHLEY Date: Thu, 19 Nov 2020 17:05:43 -0500 Subject: [PATCH 1/9] ceph 15.2.6 GA Signed-off-by: Kaleb S KEITHLEY --- ceph.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ceph.spec b/ceph.spec index e4cc03a..4e8cb2f 100644 --- a/ceph.spec +++ b/ceph.spec @@ -100,7 +100,7 @@ # main package definition ################################################################################# Name: ceph -Version: 15.2.5 +Version: 15.2.6 Release: 1%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 @@ -2375,6 +2375,9 @@ exit 0 %config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml %changelog +* Thu Nov 19 2020 Kaleb S. KEITHLEY - 2:15.2.6-1 +- ceph 15.2.6 GA + * Wed Sep 16 2020 Kaleb S. KEITHLEY - 2:15.2.5-1 - ceph 15.2.5 GA diff --git a/sources b/sources index 9fa2b9d..eb664b5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ceph-15.2.5.tar.gz) = 55de068886c48293e92ef95cf8343ae44825fd2bf9c3fa7d47cda92907a47bae79e0af730cd34d0155b0777901d0fd6f9d1f30537c66c54c95098df7368fca2e +SHA512 (ceph-15.2.6.tar.gz) = 0bbbbc532fb9f29437c094a86a1e58040f03b679e4d52ea9cc752ecf411c594c8ec37dc5e9f0ee47712d32b93b4e60b0f3fded280867d41c41b8db806b375e4e From da3f27e5635530561e3603ce9e6e7692d68584fe Mon Sep 17 00:00:00 2001 From: Kaleb S KEITHLEY Date: Mon, 30 Nov 2020 23:33:46 -0500 Subject: [PATCH 2/9] ceph 15.2.7 GA Signed-off-by: Kaleb S KEITHLEY --- ceph.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ceph.spec b/ceph.spec index 4e8cb2f..f315ee6 100644 --- a/ceph.spec +++ b/ceph.spec @@ -100,7 +100,7 @@ # main package definition ################################################################################# Name: ceph -Version: 15.2.6 +Version: 15.2.7 Release: 1%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 @@ -2375,6 +2375,9 @@ exit 0 %config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml %changelog +* Mon Nov 30 2020 Kaleb S. KEITHLEY - 2:15.2.7-1 +- ceph 15.2.7 GA + * Thu Nov 19 2020 Kaleb S. KEITHLEY - 2:15.2.6-1 - ceph 15.2.6 GA diff --git a/sources b/sources index eb664b5..0b42528 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ceph-15.2.6.tar.gz) = 0bbbbc532fb9f29437c094a86a1e58040f03b679e4d52ea9cc752ecf411c594c8ec37dc5e9f0ee47712d32b93b4e60b0f3fded280867d41c41b8db806b375e4e +SHA512 (ceph-15.2.7.tar.gz) = bfe07cefcd603d773216a2b1d49fb32bdf1185dfb69b30d5362eb48d3afa2984cebffb598f7d68bfbd9afdc2f29975130a585a9b83724ca6a3f59163895c0de0 From df3db8be0e7e94afef5dd1548509d69d69200133 Mon Sep 17 00:00:00 2001 From: Kaleb S KEITHLEY Date: Thu, 24 Dec 2020 06:19:25 -0500 Subject: [PATCH 3/9] ceph 15.2.8 GA Signed-off-by: Kaleb S KEITHLEY --- ceph.spec | 18 ++++++++++++------ sources | 2 +- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/ceph.spec b/ceph.spec index f315ee6..4c0a001 100644 --- a/ceph.spec +++ b/ceph.spec @@ -100,7 +100,7 @@ # main package definition ################################################################################# Name: ceph -Version: 15.2.7 +Version: 15.2.8 Release: 1%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 @@ -487,6 +487,10 @@ Group: System/Filesystems %endif Provides: ceph-test:/usr/bin/ceph-monstore-tool Requires: ceph-base = %{_epoch_prefix}%{version}-%{release} +%if 0%{?weak_deps} +Recommends: nvme-cli +Recommends: smartmontools +%endif %description mon ceph-mon is the cluster monitor daemon for the Ceph distributed file system. One or more instances of ceph-mon form a Paxos part-time @@ -758,6 +762,10 @@ Requires: lvm2 Requires: sudo Requires: libstoragemgmt Requires: python%{python3_pkgversion}-ceph-common = %{_epoch_prefix}%{version}-%{release} +%if 0%{?weak_deps} +Recommends: nvme-cli +Recommends: smartmontools +%endif %description osd ceph-osd is the object storage daemon for the Ceph distributed file system. It is responsible for storing objects on a local file system @@ -1321,7 +1329,6 @@ install -m 0644 -D udev/50-rbd.rules %{buildroot}%{_udevrulesdir}/50-rbd.rules # sudoers.d install -m 0600 -D sudoers.d/ceph-osd-smartctl %{buildroot}%{_sysconfdir}/sudoers.d/ceph-osd-smartctl -install -m 0600 -D sudoers.d/cephadm %{buildroot}%{_sysconfdir}/sudoers.d/cephadm %if 0%{?rhel} >= 8 pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{_bindir}/* @@ -1475,7 +1482,6 @@ exit 0 %files -n cephadm %{_sbindir}/cephadm %{_mandir}/man8/cephadm.8* -%{_sysconfdir}/sudoers.d/cephadm %attr(0700,cephadm,cephadm) %dir %{_sharedstatedir}/cephadm %attr(0700,cephadm,cephadm) %dir %{_sharedstatedir}/cephadm/.ssh %attr(0600,cephadm,cephadm) %{_sharedstatedir}/cephadm/.ssh/authorized_keys @@ -2155,7 +2161,6 @@ fi %files -n librgw2 %{_libdir}/librgw.so.* -%{_libdir}/librgw_admin_user.so.* %if %{with lttng} %{_libdir}/librgw_op_tp.so.* %{_libdir}/librgw_rados_tp.so.* @@ -2168,10 +2173,8 @@ fi %files -n librgw-devel %dir %{_includedir}/rados %{_includedir}/rados/librgw.h -%{_includedir}/rados/librgw_admin_user.h %{_includedir}/rados/rgw_file.h %{_libdir}/librgw.so -%{_libdir}/librgw_admin_user.so %if %{with lttng} %{_libdir}/librgw_op_tp.so %{_libdir}/librgw_rados_tp.so @@ -2375,6 +2378,9 @@ exit 0 %config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml %changelog +* Wed Dec 23 2020 Kaleb S. KEITHLEY - 2:15.2.8-1 +- ceph 15.2.8 GA + * Mon Nov 30 2020 Kaleb S. KEITHLEY - 2:15.2.7-1 - ceph 15.2.7 GA diff --git a/sources b/sources index 0b42528..0e8e3c0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ceph-15.2.7.tar.gz) = bfe07cefcd603d773216a2b1d49fb32bdf1185dfb69b30d5362eb48d3afa2984cebffb598f7d68bfbd9afdc2f29975130a585a9b83724ca6a3f59163895c0de0 +SHA512 (ceph-15.2.8.tar.gz) = 66c7322575165b4747955ac9de34f9f9e2d4361c8cd8498819383883045601b92f786c4336c79369d6f019db1c4524c492faa40cdceed7fc1b2b373ca6ab5065 From f52ea67e29fb49b7c7399648a973dc142dfa5fa5 Mon Sep 17 00:00:00 2001 From: Kaleb S KEITHLEY Date: Mon, 4 Jan 2021 21:12:08 -0500 Subject: [PATCH 4/9] ceph 15.2.8 GA Signed-off-by: Kaleb S KEITHLEY --- 0004-src-common-ceph-time.h.patch | 10 ++++ 0005-src-CMakeLists.txt.patch | 21 ++++++++ 0006-src-rgw-rgw_asio_frontend.cc.patch | 64 +++++++++++++++++++++++++ ceph.spec | 5 +- 4 files changed, 99 insertions(+), 1 deletion(-) create mode 100644 0004-src-common-ceph-time.h.patch create mode 100644 0005-src-CMakeLists.txt.patch create mode 100644 0006-src-rgw-rgw_asio_frontend.cc.patch diff --git a/0004-src-common-ceph-time.h.patch b/0004-src-common-ceph-time.h.patch new file mode 100644 index 0000000..c8f7661 --- /dev/null +++ b/0004-src-common-ceph-time.h.patch @@ -0,0 +1,10 @@ +--- ceph-15.2.8/src/common/ceph_time.h.orig 2020-12-24 06:23:32.605762289 -0500 ++++ ceph-15.2.8/src/common/ceph_time.h 2020-12-24 13:50:14.304877611 -0500 +@@ -18,6 +18,7 @@ + #include + #include + #include ++#include + #include + + #include "include/ceph_assert.h" diff --git a/0005-src-CMakeLists.txt.patch b/0005-src-CMakeLists.txt.patch new file mode 100644 index 0000000..00a017c --- /dev/null +++ b/0005-src-CMakeLists.txt.patch @@ -0,0 +1,21 @@ +--- ceph-15.2.8/src/CMakeLists.txt.orig 2021-01-03 12:47:00.275274985 -0500 ++++ ceph-15.2.8/src/CMakeLists.txt 2021-01-03 12:51:17.957185433 -0500 +@@ -23,10 +23,15 @@ + set(datadir ${CEPH_INSTALL_DATADIR}) + set(prefix ${CMAKE_INSTALL_PREFIX}) + +-add_definitions("-DHAVE_CONFIG_H -D__CEPH__ -D_REENTRANT -D_THREAD_SAFE -D__STDC_FORMAT_MACROS") +-add_definitions("-D_FILE_OFFSET_BITS=64") ++add_definitions(-DHAVE_CONFIG_H ++ -D__CEPH__ ++ -D_REENTRANT ++ -D_THREAD_SAFE ++ -D__STDC_FORMAT_MACROS ++ -D_FILE_OFFSET_BITS=64 ++ -DBOOST_ASIO_DISABLE_THREAD_KEYWORD_EXTENSION) + if(LINUX) +- add_definitions("-D_GNU_SOURCE") ++ add_definitions(-D_GNU_SOURCE) + endif() + + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall") diff --git a/0006-src-rgw-rgw_asio_frontend.cc.patch b/0006-src-rgw-rgw_asio_frontend.cc.patch new file mode 100644 index 0000000..de47ac6 --- /dev/null +++ b/0006-src-rgw-rgw_asio_frontend.cc.patch @@ -0,0 +1,64 @@ +--- ceph-15.2.8/src/rgw/rgw_asio_frontend.cc.orig 2020-12-16 12:29:50.000000000 -0500 ++++ ceph-15.2.8/src/rgw/rgw_asio_frontend.cc 2021-01-04 18:20:49.156104233 -0500 +@@ -2,6 +2,7 @@ + // vim: ts=8 sw=2 smarttab ft=cpp + + #include ++#include + #include + #include + +@@ -138,6 +139,29 @@ + return out << h.quote << p->value() << h.quote; + } + ++// log fractional seconds in milliseconds ++struct log_ms_remainder { ++ ceph::coarse_real_time t; ++ log_ms_remainder(ceph::coarse_real_time t) : t(t) {} ++}; ++std::ostream& operator<<(std::ostream& out, const log_ms_remainder& m) { ++ using namespace std::chrono; ++ return out << std::setfill('0') << std::setw(3) ++ << duration_cast(m.t.time_since_epoch()).count() % 1000; ++} ++ ++// log time in apache format: day/month/year:hour:minute:second zone ++struct log_apache_time { ++ ceph::coarse_real_time t; ++ log_apache_time(ceph::coarse_real_time t) : t(t) {} ++}; ++std::ostream& operator<<(std::ostream& out, const log_apache_time& a) { ++ const auto t = ceph::coarse_real_clock::to_time_t(a.t); ++ const auto local = std::localtime(&t); ++ return out << std::put_time(local, "%d/%b/%Y:%T.") << log_ms_remainder{a.t} ++ << std::put_time(local, " %z"); ++}; ++ + using SharedMutex = ceph::async::SharedMutex; + + template +@@ -228,16 +252,20 @@ + RGWRestfulIO client(cct, &real_client_io); + auto y = optional_yield{context, yield}; + int http_ret = 0; ++ string user = "-"; ++ const auto started = ceph::coarse_real_clock::now(); ++ + process_request(env.store, env.rest, &req, env.uri_prefix, + *env.auth_registry, &client, env.olog, y, + scheduler, &http_ret); + + if (cct->_conf->subsys.should_gather(dout_subsys, 1)) { + // access log line elements begin per Apache Combined Log Format with additions following +- const auto now = ceph::coarse_real_clock::now(); +- using ceph::operator<<; // for coarse_real_time ++ // const auto now = ceph::coarse_real_clock::now(); ++ // using ceph::operator<<; // for coarse_real_time + ldout(cct, 1) << "beast: " << hex << &req << dec << ": " +- << remote_endpoint.address() << " - - [" << now << "] \"" ++ // << remote_endpoint.address() << " - - [" << now << "] \"" ++ << remote_endpoint.address() << " - " << user << " [" << log_apache_time{started} << "] \"" + << message.method_string() << ' ' << message.target() << ' ' + << http_version{message.version()} << "\" " << http_ret << ' ' + << client.get_bytes_sent() + client.get_bytes_received() << ' ' diff --git a/ceph.spec b/ceph.spec index 4c0a001..c691963 100644 --- a/ceph.spec +++ b/ceph.spec @@ -121,6 +121,9 @@ Source0: %{?_remote_tarball_prefix}ceph-%{version}.tar.gz Patch0001: 0001-src-common-crc32c_intel_fast.patch Patch0002: 0002-src-common-CMakeLists.txt.patch Patch0003: 0003-src-common-bitstr.h.patch +Patch0004: 0004-src-common-ceph-time.h.patch +Patch0005: 0005-src-CMakeLists.txt.patch +Patch0006: 0006-src-rgw-rgw_asio_frontend.cc.patch Source1: cmake-modules-BuildBoost.cmake.noautopatch # ceph 14.0.1 does not support 32-bit architectures, bugs #1727788, #1727787 ExcludeArch: i686 armv7hl @@ -1278,7 +1281,7 @@ cat ./CMakeFiles/CMakeError.log export VERBOSE=1 export V=1 -%cmake_build "$CEPH_MFLAGS_JOBS" +%cmake_build %if 0%{with make_check} From f871a2726e019d87942b8a36cf308905820639ba Mon Sep 17 00:00:00 2001 From: Kaleb S KEITHLEY Date: Thu, 7 Jan 2021 09:41:48 -0500 Subject: [PATCH 5/9] ceph 15.2.8, fuse3-devel Signed-off-by: Kaleb S KEITHLEY --- ceph.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ceph.spec b/ceph.spec index c691963..19e5aeb 100644 --- a/ceph.spec +++ b/ceph.spec @@ -101,7 +101,7 @@ ################################################################################# Name: ceph Version: 15.2.8 -Release: 1%{?dist} +Release: 2%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 %endif @@ -154,7 +154,7 @@ BuildRequires: cmake3 > 3.5 BuildRequires: cmake > 3.5 %endif BuildRequires: cryptsetup -BuildRequires: fuse-devel +BuildRequires: fuse3-devel BuildRequires: fmt-devel %if 0%{?rhel} == 7 # devtoolset offers newer make and valgrind-devel, but the old ones are good @@ -2381,6 +2381,9 @@ exit 0 %config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml %changelog +* Thu Jan 7 2020 Kaleb S. KEITHLEY - 2:15.2.8-2 +- ceph 15.2.8, fuse3-devel + * Wed Dec 23 2020 Kaleb S. KEITHLEY - 2:15.2.8-1 - ceph 15.2.8 GA From 7b01ed79a00e2851ede03f35243675abc2671e30 Mon Sep 17 00:00:00 2001 From: Kaleb S KEITHLEY Date: Fri, 8 Jan 2021 11:57:54 -0500 Subject: [PATCH 6/9] ceph 15.2.8, %changelog date Signed-off-by: Kaleb S KEITHLEY --- ceph.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ceph.spec b/ceph.spec index 19e5aeb..4607852 100644 --- a/ceph.spec +++ b/ceph.spec @@ -101,7 +101,7 @@ ################################################################################# Name: ceph Version: 15.2.8 -Release: 2%{?dist} +Release: 3%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 %endif @@ -2381,7 +2381,10 @@ exit 0 %config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml %changelog -* Thu Jan 7 2020 Kaleb S. KEITHLEY - 2:15.2.8-2 +* Fri Jan 8 2021 Kaleb S. KEITHLEY - 2:15.2.8-3 +- ceph 15.2.8, %%changelog date + +* Thu Jan 7 2021 Kaleb S. KEITHLEY - 2:15.2.8-2 - ceph 15.2.8, fuse3-devel * Wed Dec 23 2020 Kaleb S. KEITHLEY - 2:15.2.8-1 From 19975cf06eb54e5934a23e1a7fa06c90b381a5de Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 22 Jan 2021 16:34:27 +0000 Subject: [PATCH 7/9] Rebuilt for Boost 1.75 --- ceph.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ceph.spec b/ceph.spec index 4607852..02b98f8 100644 --- a/ceph.spec +++ b/ceph.spec @@ -101,7 +101,7 @@ ################################################################################# Name: ceph Version: 15.2.8 -Release: 3%{?dist} +Release: 4%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 %endif @@ -2381,6 +2381,9 @@ exit 0 %config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml %changelog +* Fri Jan 22 2021 Jonathan Wakely - 2:15.2.8-4 +- Rebuilt for Boost 1.75 + * Fri Jan 8 2021 Kaleb S. KEITHLEY - 2:15.2.8-3 - ceph 15.2.8, %%changelog date From 9e63d618792223e8723935f82fc47ddad4117909 Mon Sep 17 00:00:00 2001 From: Kaleb S KEITHLEY Date: Fri, 22 Jan 2021 15:40:08 -0500 Subject: [PATCH 8/9] rebuilt with bundled Boost --- ceph.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ceph.spec b/ceph.spec index 02b98f8..589d7f5 100644 --- a/ceph.spec +++ b/ceph.spec @@ -101,7 +101,7 @@ ################################################################################# Name: ceph Version: 15.2.8 -Release: 4%{?dist} +Release: 5%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 %endif @@ -1241,7 +1241,7 @@ cd build -DWITH_OCF=ON \ %endif -DWITH_REENTRANT_STRSIGNAL=ON \ - -DWITH_SYSTEM_BOOST=ON \ + -DWITH_SYSTEM_BOOST=OFF \ %ifarch aarch64 armv7hl mips mipsel ppc ppc64 ppc64le %{ix86} x86_64 -DWITH_BOOST_CONTEXT=ON \ %else @@ -2381,6 +2381,9 @@ exit 0 %config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml %changelog +* Fri Jan 22 2021 Kaleb S. KEITHLEY - 2:15.2.8-5 +- rebuilt with bundled Boost + * Fri Jan 22 2021 Jonathan Wakely - 2:15.2.8-4 - Rebuilt for Boost 1.75 From 501243427ac6df390b83e07f650939791fb393b2 Mon Sep 17 00:00:00 2001 From: Kaleb S KEITHLEY Date: Mon, 25 Jan 2021 18:14:45 -0500 Subject: [PATCH 9/9] rebuilt with system Boost Signed-off-by: Kaleb S KEITHLEY --- 0005-src-CMakeLists.txt.patch | 9 +++++---- 0007-src-tools-rbd-action-Bench.cc.patch | 10 ++++++++++ ceph.spec | 8 ++++++-- 3 files changed, 21 insertions(+), 6 deletions(-) create mode 100644 0007-src-tools-rbd-action-Bench.cc.patch diff --git a/0005-src-CMakeLists.txt.patch b/0005-src-CMakeLists.txt.patch index 00a017c..0aecebd 100644 --- a/0005-src-CMakeLists.txt.patch +++ b/0005-src-CMakeLists.txt.patch @@ -1,6 +1,6 @@ ---- ceph-15.2.8/src/CMakeLists.txt.orig 2021-01-03 12:47:00.275274985 -0500 -+++ ceph-15.2.8/src/CMakeLists.txt 2021-01-03 12:51:17.957185433 -0500 -@@ -23,10 +23,15 @@ +--- ceph-15.2.8/src/CMakeLists.txt.orig 2021-01-25 13:34:31.122206146 -0500 ++++ ceph-15.2.8/src/CMakeLists.txt 2021-01-25 13:37:12.863612216 -0500 +@@ -23,10 +23,16 @@ set(datadir ${CEPH_INSTALL_DATADIR}) set(prefix ${CMAKE_INSTALL_PREFIX}) @@ -12,7 +12,8 @@ + -D_THREAD_SAFE + -D__STDC_FORMAT_MACROS + -D_FILE_OFFSET_BITS=64 -+ -DBOOST_ASIO_DISABLE_THREAD_KEYWORD_EXTENSION) ++ -DBOOST_ASIO_DISABLE_THREAD_KEYWORD_EXTENSION ++ -DBOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT) if(LINUX) - add_definitions("-D_GNU_SOURCE") + add_definitions(-D_GNU_SOURCE) diff --git a/0007-src-tools-rbd-action-Bench.cc.patch b/0007-src-tools-rbd-action-Bench.cc.patch new file mode 100644 index 0000000..d0ced55 --- /dev/null +++ b/0007-src-tools-rbd-action-Bench.cc.patch @@ -0,0 +1,10 @@ +--- ceph-15.2.8/src/tools/rbd/action/Bench.cc.orig 2021-01-25 17:08:06.189223814 -0500 ++++ ceph-15.2.8/src/tools/rbd/action/Bench.cc 2021-01-25 17:08:27.297805754 -0500 +@@ -10,6 +10,7 @@ + #include "include/types.h" + #include "global/signal_handler.h" + #include ++#include + #include + #include + #include diff --git a/ceph.spec b/ceph.spec index 589d7f5..ed3a839 100644 --- a/ceph.spec +++ b/ceph.spec @@ -101,7 +101,7 @@ ################################################################################# Name: ceph Version: 15.2.8 -Release: 5%{?dist} +Release: 6%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 %endif @@ -124,6 +124,7 @@ Patch0003: 0003-src-common-bitstr.h.patch Patch0004: 0004-src-common-ceph-time.h.patch Patch0005: 0005-src-CMakeLists.txt.patch Patch0006: 0006-src-rgw-rgw_asio_frontend.cc.patch +Patch0007: 0007-src-tools-rbd-action-Bench.cc.patch Source1: cmake-modules-BuildBoost.cmake.noautopatch # ceph 14.0.1 does not support 32-bit architectures, bugs #1727788, #1727787 ExcludeArch: i686 armv7hl @@ -1241,7 +1242,7 @@ cd build -DWITH_OCF=ON \ %endif -DWITH_REENTRANT_STRSIGNAL=ON \ - -DWITH_SYSTEM_BOOST=OFF \ + -DWITH_SYSTEM_BOOST=ON \ %ifarch aarch64 armv7hl mips mipsel ppc ppc64 ppc64le %{ix86} x86_64 -DWITH_BOOST_CONTEXT=ON \ %else @@ -2381,6 +2382,9 @@ exit 0 %config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml %changelog +* Mon Jan 25 2021 Kaleb S. KEITHLEY - 2:15.2.8-6 +- rebuilt with system Boost + * Fri Jan 22 2021 Kaleb S. KEITHLEY - 2:15.2.8-5 - rebuilt with bundled Boost