diff --git a/README.md b/README.md index 06ce09a..50a81b7 100644 --- a/README.md +++ b/README.md @@ -22,5 +22,5 @@ Create a src.rpm with: To build: - $ cbs build [--scratch] storage8-ceph-octopus-el8 ceph-15.2.8-1.el8.src.rpm + $ cbs build [--scratch] storage8-ceph-octopus-el8 ceph-15.2.9-1.el8.src.rpm diff --git a/SOURCES/0004-src-include-config-h-in-cmake.patch b/SOURCES/0004-src-include-config-h-in-cmake.patch new file mode 100644 index 0000000..6682aae --- /dev/null +++ b/SOURCES/0004-src-include-config-h-in-cmake.patch @@ -0,0 +1,30 @@ +--- 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 bd50dba..4b1ef23 100644 --- a/SPECS/ceph.spec +++ b/SPECS/ceph.spec @@ -100,7 +100,7 @@ # main package definition ################################################################################# Name: ceph -Version: 15.2.8 +Version: 15.2.9 Release: 1%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 @@ -121,6 +121,7 @@ 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-include-config-h-in-cmake.patch Source1: cmake-modules-BuildBoost.cmake.noautopatch # ceph 14.0.1 does not support 32-bit architectures, bugs #1727788, #1727787 ExcludeArch: i686 armv7hl @@ -425,6 +426,7 @@ Base is the package that includes all the files shared amongst ceph servers %package -n cephadm Summary: Utility to bootstrap Ceph clusters +BuildArch: noarch Requires: lvm2 %if 0%{?suse_version} Requires: apparmor-abstractions @@ -488,8 +490,12 @@ Provides: ceph-test:/usr/bin/ceph-monstore-tool Requires: ceph-base = %{_epoch_prefix}%{version}-%{release} %if 0%{?weak_deps} Recommends: nvme-cli +%if 0%{?suse_version} +Requires: smartmontools +%else Recommends: smartmontools %endif +%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 @@ -763,8 +769,12 @@ Requires: libstoragemgmt Requires: python%{python3_pkgversion}-ceph-common = %{_epoch_prefix}%{version}-%{release} %if 0%{?weak_deps} Recommends: nvme-cli +%if 0%{?suse_version} +Requires: smartmontools +%else Recommends: smartmontools %endif +%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 @@ -1332,7 +1342,7 @@ ln -sf %{_sbindir}/mount.ceph %{buildroot}/sbin/mount.ceph 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 0440 -D sudoers.d/ceph-osd-smartctl %{buildroot}%{_sysconfdir}/sudoers.d/ceph-osd-smartctl %if 0%{?rhel} >= 8 pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{_bindir}/* @@ -2382,6 +2392,9 @@ exit 0 %config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml %changelog +* Fri Feb 26 2021 Kaleb S. KEITHLEY - 2:15.2.9-1 +- ceph 15.2.9 GA + * Mon Dec 28 2020 Kaleb S. KEITHLEY - 2:15.2.8-1 - ceph 15.2.8 GA