rpms/ceph
7
0
Fork 0
Code Issues Pull Requests Releases Activity

see 15.2.4-3, hopefully for real this time

Browse Source 
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
This commit is contained in:
Kaleb S. KEITHLEY 2020-07-20 16:11:22 -04:00
parent 6daabd97d4
commit 2e1f76369c
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
0001-src-common-crc32c_intel_fast.patch
View File

@ -1,5 +1,5 @@
--- ceph-15.2.2/src/yasm-wrapper.orig 2020-03-09 12:57:37.603837466 -0400 --- ceph-15.2.4/src/yasm-wrapper.orig 2020-06-30 11:40:51.000000000 -0400
+++ ceph-15.2.2/src/yasm-wrapper 2020-03-09 13:02:31.496796609 -0400 +++ ceph-15.2.4/src/yasm-wrapper 2020-07-20 12:21:34.574980869 -0400
@@ -1,10 +1,11 @@ @@ -1,10 +1,11 @@
-#!/bin/sh -e -#!/bin/sh -e
+#!/bin/sh +#!/bin/sh
@ -26,8 +26,7 @@
* ) * )
new="$new $1" new="$new $1"
shift shift
@@ -36,8 +43,15 @@
@@ -36,8 +43,16 @@
esac esac
done done
@ -42,7 +41,6 @@
+ ld -r -z ibt -z shstk -z noexecstack -o ${object}.tmp ${object} + ld -r -z ibt -z shstk -z noexecstack -o ${object}.tmp ${object}
+ mv ${object}.tmp ${object} + mv ${object}.tmp ${object}
+fi +fi
+
[ -n "$touch" ] && touch $touch [ -n "$touch" ] && touch $touch

8
ceph.spec
View File

@ -21,6 +21,7 @@
# bcond syntax! # bcond syntax!
################################################################################# #################################################################################
%global _hardened_build 1 %global _hardened_build 1
%global __cmake_in_source_build 1
%bcond_with make_check %bcond_with make_check
%bcond_with cmake_verbose_logging %bcond_with cmake_verbose_logging
@ -101,7 +102,7 @@
################################################################################# #################################################################################
Name: ceph Name: ceph
Version: 15.2.4 Version: 15.2.4
Release: 6%{?dist} Release: 7%{?dist}
%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel}
Epoch: 2 Epoch: 2
%endif %endif
@ -1222,6 +1223,7 @@ cd build
%if 0%{with ocf} %if 0%{with ocf}
-DWITH_OCF=ON \ -DWITH_OCF=ON \
%endif %endif
-DWITH_REENTRANT_STRSIGNAL=ON \
-DWITH_SYSTEM_BOOST=ON \ -DWITH_SYSTEM_BOOST=ON \
%ifarch aarch64 armv7hl mips mipsel ppc ppc64 ppc64le %{ix86} x86_64 %ifarch aarch64 armv7hl mips mipsel ppc ppc64 ppc64le %{ix86} x86_64
-DWITH_BOOST_CONTEXT=ON \ -DWITH_BOOST_CONTEXT=ON \
@ -1246,7 +1248,6 @@ cd build
%else %else
-DWITH_RADOSGW_KAFKA_ENDPOINT=OFF \ -DWITH_RADOSGW_KAFKA_ENDPOINT=OFF \
%endif %endif
-DWITH_REENTRANT_STRSIGNAL=ON \
%if 0%{with cmake_verbose_logging} %if 0%{with cmake_verbose_logging}
-DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_VERBOSE_MAKEFILE=ON \
%endif %endif
@ -2368,6 +2369,9 @@ exit 0
%config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml %config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml
%changelog %changelog
* Fri Jul 17 2020 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:15.2.4-7
- see 15.2.4-3, hopefully for real this time
* Fri Jul 17 2020 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:15.2.4-6 * Fri Jul 17 2020 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:15.2.4-6
- see 15.2.4-4 - see 15.2.4-4