diff --git a/.ceph.metadata b/.ceph.metadata index 7d10768..1d8c660 100644 --- a/.ceph.metadata +++ b/.ceph.metadata @@ -1 +1 @@ -2eb3d38288df77154e7515b28b8eb27cb267a190 SOURCES/ceph-17.1.0.tar.gz +c2931e7b3bf8b55c801ff6f513243635ae242905 SOURCES/ceph-17.1.0-56-g60fdd357.tar.gz diff --git a/SOURCES/0019-cmake-modules-CheckCxxAtomic.cmake.patch b/SOURCES/0019-cmake-modules-CheckCxxAtomic.cmake.patch new file mode 100644 index 0000000..b8c0186 --- /dev/null +++ b/SOURCES/0019-cmake-modules-CheckCxxAtomic.cmake.patch @@ -0,0 +1,10 @@ +--- ceph-17.1.0/cmake/modules/CheckCxxAtomic.cmake.orig 2022-03-07 15:01:49.809505648 -0500 ++++ ceph-17.1.0/cmake/modules/CheckCxxAtomic.cmake 2022-03-09 12:47:31.018446185 -0500 +@@ -21,6 +21,7 @@ + // We specifically test access via an otherwise unknown pointer here + // to ensure we get the most complex case. If this access can be + // done without libatomic, then all accesses can be done. ++bool atomic16(std::atomic *ptr) __attribute__ ((used)); + bool atomic16(std::atomic *ptr) + { + return *ptr != 0; diff --git a/SPECS/ceph.spec b/SPECS/ceph.spec index 046a1b9..4d0aa4b 100644 --- a/SPECS/ceph.spec +++ b/SPECS/ceph.spec @@ -151,7 +151,7 @@ ################################################################################# Name: ceph Version: 17.1.0 -Release: 0.3.rc1%{?dist} +Release: 0.5.56.g60fdd357%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 %endif @@ -167,7 +167,8 @@ License: (LGPLv2+ or LGPLv3) and CC-BY-SA-3.0 and GPLv2 and Boost-1.0 and BSD an Group: System/Filesystems %endif URL: http://ceph.com/ -Source0: ceph-17.1.0.tar.gz +#Source0: ceph-17.1.0.tar.gz +Source0: ceph-17.1.0-56-g60fdd357.tar.gz Patch0001: 0001-src-common-crc32c_intel_fast.patch Patch0003: 0003-src-common-bitstr.h.patch Patch0008: 0008-cmake-modules-Finduring.cmake.patch @@ -177,7 +178,8 @@ Patch0012: 0012-spdk-isa-l-CET-Add-CET-marker-to-x86-64-crc32-assemb.patch Patch0016: 0016-src-tracing-patch Patch0017: 0017-gcc-12-omnibus.patch Patch0018: 0018-src-rgw-store-dbstore-CMakeLists.txt.patch -# Source1: cmake-modules-BuildBoost.cmake.noautopatch +Patch0019: 0019-cmake-modules-CheckCxxAtomic.cmake.patch + # ceph 14.0.1 does not support 32-bit architectures, bugs #1727788, #1727787 ExcludeArch: i686 armv7hl %if 0%{?suse_version} @@ -1251,10 +1253,7 @@ This package provides Ceph default alerts for Prometheus. # common ################################################################################# %prep -%autosetup -p1 -# %%ifarch x86_64 -# patch -p1 < %{SOURCE1} -# %%endif +%autosetup -p1 -n ceph-17.1.0-56-g60fdd357 %build # Disable lto on systems that do not support symver attribute @@ -2563,6 +2562,9 @@ exit 0 %config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml %changelog +* Mon Mar 21 2022 Kaleb S. KEITHLEY - 2:17.1.0-0.5.56-g60fdd357 +- 17.1.0 snapshot 56 + * Wed Mar 2 2022 Kaleb S. KEITHLEY - 2:17.1.0-0.3.rc1 - 17.1.0, w/o cephadm