diff --git a/.ceph.metadata b/.ceph.metadata index ab76330..cb75dfe 100644 --- a/.ceph.metadata +++ b/.ceph.metadata @@ -1 +1 @@ -2a977307df2e054361e2c20e378ecc50b399b1ee SOURCES/ceph-16.2.1.tar.gz +4d27ecdaa5dadb59b34783ba8cabed94213a1bc4 SOURCES/ceph-16.2.2.tar.gz diff --git a/README.md b/README.md index 23f7954..84eb626 100644 --- a/README.md +++ b/README.md @@ -22,5 +22,5 @@ Create a src.rpm with: To build: - $ cbs build [--scratch] storage8-ceph-pacific-el8 ceph-16.2.0-1.el8.src.rpm + $ cbs build [--scratch] storage8-ceph-pacific-el8 ceph-16.2.2-1.el8.src.rpm diff --git a/SOURCES/0004-src-CMakeLists.txt.patch b/SOURCES/0004-src-CMakeLists.txt.patch deleted file mode 100644 index f3f2e36..0000000 --- a/SOURCES/0004-src-CMakeLists.txt.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- ceph-16.0.0/src/CMakeLists.txt.orig 2021-01-25 13:45:15.316053258 -0500 -+++ ceph-16.0.0/src/CMakeLists.txt 2021-01-25 13:43:34.418305591 -0500 -@@ -29,7 +29,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") - endif() diff --git a/SOURCES/0004-src-include-config-h-in-cmake.patch b/SOURCES/0004-src-include-config-h-in-cmake.patch deleted file mode 100644 index 6682aae..0000000 --- a/SOURCES/0004-src-include-config-h-in-cmake.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- ceph-15.2.9/src/include/config-h.in.cmake.orig 2021-02-26 13:32:11.218444320 -0500 -+++ ceph-15.2.9/src/include/config-h.in.cmake 2021-02-26 15:00:31.976950884 -0500 -@@ -1,7 +1,6 @@ - /* config.h file expanded by Cmake for build */ - --#ifndef CONFIG_H --#define CONFIG_H -+#pragma once - - /* fallocate(2) is supported */ - #cmakedefine CEPH_HAVE_FALLOCATE -@@ -354,4 +353,3 @@ - /* Define if RWL is enabled */ - #cmakedefine WITH_RBD_RWL - --#endif /* CONFIG_H */ ---- ceph-15.2.9/src/global/signal_handler.h.orig 2021-02-26 15:34:39.500250672 -0500 -+++ ceph-15.2.9/src/global/signal_handler.h 2021-02-26 15:35:39.514842687 -0500 -@@ -20,9 +20,9 @@ - - typedef void (*signal_handler_t)(int); - --#ifdef HAVE_SIGDESCR_NP -+#if defined(HAVE_SIGDESCR_NP) - # define sig_str(signum) sigdescr_np(signum) --#elif HAVE_REENTRANT_STRSIGNAL -+#elif defined(HAVE_REENTRANT_STRSIGNAL) - # define sig_str(signum) strsignal(signum) - #else - # define sig_str(signum) sys_siglist[signum] diff --git a/SPECS/ceph.spec b/SPECS/ceph.spec index d73b2f9..08fe341 100644 --- a/SPECS/ceph.spec +++ b/SPECS/ceph.spec @@ -26,7 +26,7 @@ %bcond_with zbd %bcond_with cmake_verbose_logging %bcond_with ceph_test_package -%ifarch s390 s390x +%ifarch s390 %bcond_with tcmalloc %else %bcond_without tcmalloc @@ -125,7 +125,7 @@ # main package definition ################################################################################# Name: ceph -Version: 16.2.1 +Version: 16.2.2 Release: 1%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 @@ -146,13 +146,11 @@ 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-CMakeLists.txt.patch Patch0006: 0006-src-blk-CMakeLists.txt.patch Patch0007: 0007-src-test-neorados-CMakeLists.txt.patch Patch0008: 0008-cmake-modules-Finduring.cmake.patch Patch0009: 0009-librgw-notifications-initialize-kafka-and-amqp.patch Patch0010: 0010-os-bluestore-strip-trailing-slash-for-directory-list.patch -Patch0011: 0011-rgw.patch Source1: cmake-modules-BuildBoost.cmake.noautopatch # ceph 14.0.1 does not support 32-bit architectures, bugs #1727788, #1727787 ExcludeArch: i686 armv7hl @@ -190,8 +188,12 @@ BuildRequires: gcc-c++ # %%endif BuildRequires: gdbm %if 0%{with tcmalloc} -%if 0%{?fedora} || 0%{?rhel} -BuildRequires: gperftools-devel >= 2.6.1 +# libprofiler did not build on ppc64le until 2.7.90 +%if 0%{?fedora} || 0%{?rhel} >= 8 +BuildRequires: gperftools-devel >= 2.7.90 +%endif +%if 0%{?rhel} && 0%{?rhel} < 8 +BuildRequires: gperftools-devel >= 2.6.1 %endif %if 0%{?suse_version} BuildRequires: gperftools-devel >= 2.4 @@ -351,6 +353,7 @@ BuildRequires: lz4-devel >= 1.7 # distro-conditional make check dependencies %if 0%{with make_check} %if 0%{?fedora} || 0%{?rhel} +BuildRequires: golang-github-prometheus BuildRequires: libtool-ltdl-devel BuildRequires: xmlsec1 BuildRequires: xmlsec1-devel @@ -367,6 +370,7 @@ BuildRequires: python%{python3_pkgversion}-werkzeug BuildRequires: python%{python3_pkgversion}-pyOpenSSL %endif %if 0%{?suse_version} +BuildRequires: golang-github-prometheus-prometheus BuildRequires: libxmlsec1-1 BuildRequires: libxmlsec1-nss1 BuildRequires: libxmlsec1-openssl1 @@ -448,7 +452,7 @@ Requires: python%{python3_pkgversion}-setuptools Requires: util-linux Requires: xfsprogs Requires: which -%if 0%{?fedora} || 0%{?rhel} +%if 0%{?rhel} && 0%{?rhel} < 8 # The following is necessary due to tracker 36508 and can be removed once the # associated upstream bugs are resolved. %if 0%{with tcmalloc} @@ -732,6 +736,7 @@ Summary: Ceph daemon for immutable object cache %if 0%{?suse_version} Group: System/Filesystems %endif +Requires: ceph-base = %{_epoch_prefix}%{version}-%{release} Requires: librados2 = %{_epoch_prefix}%{version}-%{release} %description immutable-object-cache Daemon for immutable object cache. @@ -2501,6 +2506,9 @@ exit 0 %config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml %changelog +* Wed May 5 2021 Kaleb S. KEITHLEY - 2:16.2.2-1 +- 16.2.2 GA + * Tue Apr 20 2021 Kaleb S. KEITHLEY - 2:16.2.1-1 - 16.2.1 GA