Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Dan Horák
|
0a05e8b2a2 | ||
|
Josef Bacik
|
4707fdaea8 |
+10
-2
@@ -1,2 +1,10 @@
|
||||
ceph-*.tar.*
|
||||
*.src.rpm
|
||||
ceph-0.20.tar.gz
|
||||
/ceph-0.21.3.tar.gz
|
||||
/ceph-0.25.1.tar.gz
|
||||
/ceph-0.26.tar.gz
|
||||
/ceph-0.31.tar.gz
|
||||
/ceph-0.37.tar.gz
|
||||
/ceph-0.39.tar.gz
|
||||
/ceph-0.43.tar.bz2
|
||||
/ceph-0.44.tar.bz2
|
||||
/ceph-0.45.tar.bz2
|
||||
|
||||
@@ -0,0 +1,52 @@
|
||||
From d3bcac241f25f681a585c2115a79befe43dd7d6c Mon Sep 17 00:00:00 2001
|
||||
From: Jim Schutt <jaschut@sandia.gov>
|
||||
Date: Wed, 21 Mar 2012 10:09:09 -0600
|
||||
Subject: [PATCH] Makefile: fix modules that cannot find pk11pub.h when
|
||||
compiling with NSS on RHEL6
|
||||
|
||||
Signed-off-by: Jim Schutt <jaschut@sandia.gov>
|
||||
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
|
||||
---
|
||||
src/Makefile.am | 5 ++++-
|
||||
1 files changed, 4 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/src/Makefile.am b/src/Makefile.am
|
||||
index a6e6a95..80802bc 100644
|
||||
--- a/src/Makefile.am
|
||||
+++ b/src/Makefile.am
|
||||
@@ -48,7 +48,7 @@ if LINUX
|
||||
ceph_osd_LDADD += -ldl
|
||||
endif
|
||||
bin_PROGRAMS += ceph-osd
|
||||
-ceph_osd_CXXFLAGS = ${AM_CXXFLAGS} \
|
||||
+ceph_osd_CXXFLAGS = ${CRYPTO_CXXFLAGS} ${AM_CXXFLAGS} \
|
||||
-I$(top_srcdir)/src/leveldb/include
|
||||
|
||||
# mds
|
||||
@@ -111,6 +111,7 @@ osdmaptool_LDADD = $(LIBGLOBAL_LDA)
|
||||
bin_PROGRAMS += monmaptool crushtool osdmaptool
|
||||
|
||||
ceph_dencoder_SOURCES = test/encoding/ceph_dencoder.cc
|
||||
+ceph_dencoder_CXXFLAGS = ${CRYPTO_CXXFLAGS} ${AM_CXXFLAGS}
|
||||
ceph_dencoder_LDADD = $(LIBGLOBAL_LDA) libosd.la libmds.a libos.la libmon.la
|
||||
bin_PROGRAMS += ceph-dencoder
|
||||
|
||||
@@ -1002,6 +1003,7 @@ libmon_la_SOURCES = \
|
||||
mon/AuthMonitor.cc \
|
||||
mon/Elector.cc \
|
||||
mon/MonitorStore.cc
|
||||
+libmon_la_CXXFLAGS= ${CRYPTO_CXXFLAGS} ${AM_CXXFLAGS}
|
||||
libmon_la_LIBADD = libglobal.la
|
||||
noinst_LTLIBRARIES += libmon.la
|
||||
|
||||
@@ -1070,6 +1072,7 @@ libosdc_la_SOURCES = \
|
||||
osdc/ObjectCacher.cc \
|
||||
osdc/Filer.cc \
|
||||
osdc/Journaler.cc
|
||||
+libosdc_la_CXXFLAGS= ${CRYPTO_CXXFLAGS} ${AM_CXXFLAGS}
|
||||
libosdc_la_LIBADD = libcommon.la
|
||||
noinst_LTLIBRARIES += libosdc.la
|
||||
|
||||
--
|
||||
1.7.7.6
|
||||
|
||||
@@ -1,228 +0,0 @@
|
||||
--- ceph-15.2.4/src/yasm-wrapper.orig 2020-06-30 11:40:51.000000000 -0400
|
||||
+++ ceph-15.2.4/src/yasm-wrapper 2020-07-20 12:21:34.574980869 -0400
|
||||
@@ -1,10 +1,11 @@
|
||||
-#!/bin/sh -e
|
||||
+#!/bin/sh
|
||||
|
||||
# libtool and yasm do not get along.
|
||||
# filter out any crap that libtool feeds us that yasm does not understand.
|
||||
#echo $0: got $*
|
||||
new=""
|
||||
touch=""
|
||||
+object=""
|
||||
while [ -n "$*" ]; do
|
||||
case "$1" in
|
||||
-f )
|
||||
@@ -29,6 +30,12 @@
|
||||
touch="$1"
|
||||
shift
|
||||
;;
|
||||
+ -o )
|
||||
+ shift
|
||||
+ object="$1"
|
||||
+ new="$new -o $1"
|
||||
+ shift
|
||||
+ ;;
|
||||
* )
|
||||
new="$new $1"
|
||||
shift
|
||||
@@ -36,8 +43,15 @@
|
||||
esac
|
||||
done
|
||||
|
||||
-#echo $0: yasm $new
|
||||
-yasm $new
|
||||
+#echo ${0}: yasm ${new}
|
||||
+yasm ${new}
|
||||
+
|
||||
+echo ${new} | grep -- "crc32c_intel_fast*asm\.s"
|
||||
+if [ $? -ne 0 ]; then
|
||||
+ touch /tmp/${object}
|
||||
+ ld -r -z ibt -z shstk -z noexecstack -o ${object}.tmp ${object}
|
||||
+ mv ${object}.tmp ${object}
|
||||
+fi
|
||||
|
||||
[ -n "$touch" ] && touch $touch
|
||||
|
||||
--- ceph-15.2.2/src/common/crc32c_intel_fast_asm.s.orig 2020-05-26 08:34:32.226201974 -0400
|
||||
+++ ceph-15.2.2/src/common/crc32c_intel_fast_asm.s 2020-05-26 17:19:20.327201974 -0400
|
||||
@@ -1,5 +1,5 @@
|
||||
;
|
||||
-; Copyright 2012-2013 Intel Corporation All Rights Reserved.
|
||||
+; Copyright 2012-2015 Intel Corporation All Rights Reserved.
|
||||
; All rights reserved.
|
||||
;
|
||||
; http://opensource.org/licenses/BSD-3-Clause
|
||||
@@ -59,16 +59,34 @@
|
||||
xor rbx, rbx ;; rbx = crc1 = 0;
|
||||
xor r10, r10 ;; r10 = crc2 = 0;
|
||||
|
||||
+ cmp len, %%bSize*3*2
|
||||
+ jbe %%non_prefetch
|
||||
+
|
||||
%assign i 0
|
||||
%rep %%bSize/8 - 1
|
||||
- crc32 rax, [bufptmp+i + 0*%%bSize] ;; update crc0
|
||||
- crc32 rbx, [bufptmp+i + 1*%%bSize] ;; update crc1
|
||||
- crc32 r10, [bufptmp+i + 2*%%bSize] ;; update crc2
|
||||
+ %if i < %%bSize*3/4
|
||||
+ prefetchnta [bufptmp+ %%bSize*3 + i*4]
|
||||
+ %endif
|
||||
+ crc32 rax, qword [bufptmp+i + 0*%%bSize] ;; update crc0
|
||||
+ crc32 rbx, qword [bufptmp+i + 1*%%bSize] ;; update crc1
|
||||
+ crc32 r10, qword [bufptmp+i + 2*%%bSize] ;; update crc2
|
||||
%assign i (i+8)
|
||||
%endrep
|
||||
- crc32 rax, [bufptmp+i + 0*%%bSize] ;; update crc0
|
||||
- crc32 rbx, [bufptmp+i + 1*%%bSize] ;; update crc1
|
||||
-; SKIP ;crc32 r10, [bufptmp+i + 2*%%bSize] ;; update crc2
|
||||
+ jmp %%next %+ %1
|
||||
+
|
||||
+%%non_prefetch:
|
||||
+ %assign i 0
|
||||
+ %rep %%bSize/8 - 1
|
||||
+ crc32 rax, qword [bufptmp+i + 0*%%bSize] ;; update crc0
|
||||
+ crc32 rbx, qword [bufptmp+i + 1*%%bSize] ;; update crc1
|
||||
+ crc32 r10, qword [bufptmp+i + 2*%%bSize] ;; update crc2
|
||||
+ %assign i (i+8)
|
||||
+ %endrep
|
||||
+
|
||||
+%%next %+ %1:
|
||||
+ crc32 rax, qword [bufptmp+i + 0*%%bSize] ;; update crc0
|
||||
+ crc32 rbx, qword [bufptmp+i + 1*%%bSize] ;; update crc1
|
||||
+; SKIP ;crc32 r10, qword [bufptmp+i + 2*%%bSize] ;; update crc2
|
||||
|
||||
; merge in crc0
|
||||
movzx bufp_dw, al
|
||||
@@ -180,12 +198,15 @@
|
||||
%define crc_init_dw r8d
|
||||
%endif
|
||||
|
||||
-
|
||||
+ endbranch
|
||||
push rdi
|
||||
push rbx
|
||||
|
||||
mov rax, crc_init ;; rax = crc_init;
|
||||
|
||||
+ cmp len, 8
|
||||
+ jb less_than_8
|
||||
+
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
;; 1) ALIGN: ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
|
||||
@@ -195,9 +216,6 @@
|
||||
;; amount of the address
|
||||
je proc_block ;; Skip if aligned
|
||||
|
||||
- cmp len, 8
|
||||
- jb less_than_8
|
||||
-
|
||||
;;;; Calculate CRC of unaligned bytes of the buffer (if any) ;;;;
|
||||
mov rbx, [bufptmp] ;; load a quadword from the buffer
|
||||
add bufptmp, bufp ;; align buffer pointer for
|
||||
@@ -233,7 +251,7 @@
|
||||
jnc bit7 ;; jump to bit-6 if bit-7 == 0
|
||||
%assign i 0
|
||||
%rep 16
|
||||
- crc32 rax, [bufptmp+i] ;; compute crc32 of 8-byte data
|
||||
+ crc32 rax, qword [bufptmp+i] ;; compute crc32 of 8-byte data
|
||||
%assign i (i+8)
|
||||
%endrep
|
||||
je do_return ;; return if remaining data is zero
|
||||
@@ -244,7 +262,7 @@
|
||||
jnc bit6 ;; jump to bit-6 if bit-7 == 0
|
||||
%assign i 0
|
||||
%rep 8
|
||||
- crc32 rax, [bufptmp+i] ;; compute crc32 of 8-byte data
|
||||
+ crc32 rax, qword [bufptmp+i] ;; compute crc32 of 8-byte data
|
||||
%assign i (i+8)
|
||||
%endrep
|
||||
je do_return ;; return if remaining data is zero
|
||||
@@ -254,7 +272,7 @@
|
||||
jnc bit5 ;; jump to bit-5 if bit-6 == 0
|
||||
%assign i 0
|
||||
%rep 4
|
||||
- crc32 rax, [bufptmp+i] ;; compute crc32 of 8-byte data
|
||||
+ crc32 rax, qword [bufptmp+i] ;; compute crc32 of 8-byte data
|
||||
%assign i (i+8)
|
||||
%endrep
|
||||
je do_return ;; return if remaining data is zero
|
||||
@@ -264,7 +282,7 @@
|
||||
jnc bit4 ;; jump to bit-4 if bit-5 == 0
|
||||
%assign i 0
|
||||
%rep 2
|
||||
- crc32 rax, [bufptmp+i] ;; compute crc32 of 8-byte data
|
||||
+ crc32 rax, qword [bufptmp+i] ;; compute crc32 of 8-byte data
|
||||
%assign i (i+8)
|
||||
%endrep
|
||||
je do_return ;; return if remaining data is zero
|
||||
@@ -272,11 +290,11 @@
|
||||
bit4:
|
||||
shl len_b, 1 ;; shift-out MSB (bit-4)
|
||||
jnc bit3 ;; jump to bit-3 if bit-4 == 0
|
||||
- crc32 rax, [bufptmp] ;; compute crc32 of 8-byte data
|
||||
+ crc32 rax, qword [bufptmp] ;; compute crc32 of 8-byte data
|
||||
je do_return ;; return if remaining data is zero
|
||||
add bufptmp, 8 ;; buf +=8; (next 8 bytes)
|
||||
bit3:
|
||||
- mov rbx, [bufptmp] ;; load a 8-bytes from the buffer:
|
||||
+ mov rbx, qword [bufptmp] ;; load a 8-bytes from the buffer:
|
||||
shl len_b, 1 ;; shift-out MSB (bit-3)
|
||||
jnc bit2 ;; jump to bit-2 if bit-3 == 0
|
||||
crc32 eax, ebx ;; compute crc32 of 4-byte data
|
||||
--- ceph-15.2.2/src/common/crc32c_intel_fast_zero_asm.s.orig 2020-05-26 08:34:32.226201974 -0400
|
||||
+++ ceph-15.2.2/src/common/crc32c_intel_fast_zero_asm.s 2020-05-26 17:19:32.497201974 -0400
|
||||
@@ -1,5 +1,5 @@
|
||||
;
|
||||
-; Copyright 2012-2013 Intel Corporation All Rights Reserved.
|
||||
+; Copyright 2012-2015 Intel Corporation All Rights Reserved.
|
||||
; All rights reserved.
|
||||
;
|
||||
; http://opensource.org/licenses/BSD-3-Clause
|
||||
@@ -59,6 +59,19 @@
|
||||
xor rbx, rbx ;; rbx = crc1 = 0;
|
||||
xor r10, r10 ;; r10 = crc2 = 0;
|
||||
|
||||
+ cmp len, %%bSize*3*2
|
||||
+ jbe %%non_prefetch
|
||||
+
|
||||
+ %assign i 0
|
||||
+ %rep %%bSize/8 - 1
|
||||
+ crc32 rax, bufptmp ;; update crc0
|
||||
+ crc32 rbx, bufptmp ;; update crc1
|
||||
+ crc32 r10, bufptmp ;; update crc2
|
||||
+ %assign i (i+8)
|
||||
+ %endrep
|
||||
+ jmp %%next %+ %1
|
||||
+
|
||||
+%%non_prefetch:
|
||||
%assign i 0
|
||||
%rep %%bSize/8 - 1
|
||||
crc32 rax, bufptmp ;; update crc0
|
||||
@@ -66,6 +79,8 @@
|
||||
crc32 r10, bufptmp ;; update crc2
|
||||
%assign i (i+8)
|
||||
%endrep
|
||||
+
|
||||
+%%next %+ %1:
|
||||
crc32 rax, bufptmp ;; update crc0
|
||||
crc32 rbx, bufptmp ;; update crc1
|
||||
; SKIP ;crc32 r10, bufptmp ;; update crc2
|
||||
@@ -180,12 +195,15 @@
|
||||
%define crc_init_dw r8d
|
||||
%endif
|
||||
|
||||
-
|
||||
+ endbranch
|
||||
push rdi
|
||||
push rbx
|
||||
|
||||
mov rax, crc_init ;; rax = crc_init;
|
||||
|
||||
+ cmp len, 8
|
||||
+ jb less_than_8
|
||||
+
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
;; 1) ALIGN: ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
|
||||
index 65ba10b0f1..eeedc29c37 100644
|
||||
--- a/src/common/CMakeLists.txt
|
||||
+++ b/src/common/CMakeLists.txt
|
||||
@@ -165,7 +165,7 @@ elseif(HAVE_ARMV8_CRC)
|
||||
crc32c_aarch64.c)
|
||||
endif(HAVE_INTEL)
|
||||
|
||||
-add_library(crc32 ${crc32_srcs})
|
||||
+add_library(crc32 STATIC ${crc32_srcs})
|
||||
if(HAVE_ARMV8_CRC)
|
||||
set_target_properties(crc32 PROPERTIES
|
||||
COMPILE_FLAGS "${CMAKE_C_FLAGS} ${ARMV8_CRC_COMPILE_FLAGS}")
|
||||
@@ -1,21 +0,0 @@
|
||||
--- ceph-15.1.0/src/common/bit_str.h.orig 2020-02-03 09:47:20.047149798 -0500
|
||||
+++ ceph-15.1.0/src/common/bit_str.h 2020-02-03 09:47:50.213149798 -0500
|
||||
@@ -17,6 +17,7 @@
|
||||
#include <cstdint>
|
||||
#include <iosfwd>
|
||||
#include <functional>
|
||||
+#include <ostream>
|
||||
|
||||
namespace ceph {
|
||||
class Formatter;
|
||||
--- ceph-15.2.4/src/global/signal_handler.h.orig 2020-07-17 12:57:54.763628429 -0400
|
||||
+++ ceph-15.2.4/src/global/signal_handler.h 2020-07-17 12:58:10.610628429 -0400
|
||||
@@ -16,6 +16,8 @@
|
||||
#define CEPH_GLOBAL_SIGNAL_HANDLER_H
|
||||
|
||||
#include <signal.h>
|
||||
+#include <string>
|
||||
+
|
||||
#include "acconfig.h"
|
||||
|
||||
typedef void (*signal_handler_t)(int);
|
||||
@@ -0,0 +1,51 @@
|
||||
diff -up ceph-0.45/src/leveldb/configure.ac.atomic ceph-0.45/src/leveldb/configure.ac
|
||||
--- ceph-0.45/src/leveldb/configure.ac.atomic 2012-04-23 18:56:15.000000000 +0200
|
||||
+++ ceph-0.45/src/leveldb/configure.ac 2012-04-23 19:33:27.000000000 +0200
|
||||
@@ -10,11 +10,11 @@ AC_CONFIG_FILES([
|
||||
])
|
||||
AC_PROG_RANLIB
|
||||
|
||||
-AC_MSG_CHECKING(whether compiler supports C++11 cstdatomic)
|
||||
+AC_MSG_CHECKING(whether compiler supports C++11 atomic)
|
||||
OLD_CXXFLAGS="$CXXFLAGS"
|
||||
CXXFLAGS="$CXXFLAGS -std=c++0x"
|
||||
AC_COMPILE_IFELSE([AC_LANG_SOURCE([
|
||||
-#include <cstdatomic>
|
||||
+#include <atomic>
|
||||
int main() {}
|
||||
])], [
|
||||
AC_MSG_RESULT(yes)
|
||||
diff -up ceph-0.45/src/leveldb/configure.atomic ceph-0.45/src/leveldb/configure
|
||||
--- ceph-0.45/src/leveldb/configure.atomic 2012-04-23 18:56:19.000000000 +0200
|
||||
+++ ceph-0.45/src/leveldb/configure 2012-04-23 18:56:43.000000000 +0200
|
||||
@@ -3885,15 +3885,15 @@ else
|
||||
fi
|
||||
|
||||
|
||||
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiler supports C++11 cstdatomic" >&5
|
||||
-$as_echo_n "checking whether compiler supports C++11 cstdatomic... " >&6; }
|
||||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiler supports C++11 atomic" >&5
|
||||
+$as_echo_n "checking whether compiler supports C++11 atomic... " >&6; }
|
||||
OLD_CXXFLAGS="$CXXFLAGS"
|
||||
CXXFLAGS="$CXXFLAGS -std=c++0x"
|
||||
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
-#include <cstdatomic>
|
||||
+#include <atomic>
|
||||
int main() {}
|
||||
|
||||
_ACEOF
|
||||
diff -up ceph-0.45/src/leveldb/port/atomic_pointer.h.atomic ceph-0.45/src/leveldb/port/atomic_pointer.h
|
||||
--- ceph-0.45/src/leveldb/port/atomic_pointer.h.atomic 2012-04-23 18:56:54.000000000 +0200
|
||||
+++ ceph-0.45/src/leveldb/port/atomic_pointer.h 2012-04-23 18:57:00.000000000 +0200
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
#include <stdint.h>
|
||||
#ifdef LEVELDB_CSTDATOMIC_PRESENT
|
||||
-#include <cstdatomic>
|
||||
+#include <atomic>
|
||||
#endif
|
||||
#ifdef OS_WIN
|
||||
#include <windows.h>
|
||||
@@ -0,0 +1,18 @@
|
||||
diff -up ceph-0.41/src/init-ceph.in.init ceph-0.41/src/init-ceph.in
|
||||
--- ceph-0.41/src/init-ceph.in.init 2012-01-17 15:33:20.000000000 -0500
|
||||
+++ ceph-0.41/src/init-ceph.in 2012-02-16 12:48:50.887279921 -0500
|
||||
@@ -1,11 +1,11 @@
|
||||
#!/bin/sh
|
||||
# Start/stop ceph daemons
|
||||
-# chkconfig: 2345 60 80
|
||||
+# chkconfig: - 60 80
|
||||
|
||||
### BEGIN INIT INFO
|
||||
# Provides: ceph
|
||||
-# Default-Start: 2 3 5
|
||||
-# Default-Stop: 0 1 6
|
||||
+# Default-Start:
|
||||
+# Default-Stop:
|
||||
# Required-Start: $remote_fs $named $network $time
|
||||
# Required-Stop: $remote_fs $named $network $time
|
||||
# Short-Description: Start Ceph distributed file system daemons at boot time
|
||||
@@ -0,0 +1,11 @@
|
||||
--- ./src/logrotate.conf.new 2012-01-11 18:23:10.597593501 -0500
|
||||
+++ ./src/logrotate.conf 2012-01-11 18:23:26.808390838 -0500
|
||||
@@ -4,7 +4,7 @@
|
||||
compress
|
||||
sharedscripts
|
||||
postrotate
|
||||
- invoke-rc.d ceph reload >/dev/null || service ceph reload >/dev/null
|
||||
+ service ceph reload >/dev/null 2>/dev/null || true
|
||||
endscript
|
||||
missingok
|
||||
}
|
||||
@@ -1,13 +0,0 @@
|
||||
diff --git a/cmake/modules/BuildBoost.cmake b/cmake/modules/BuildBoost.cmake
|
||||
index 2e92132366..3cb1e3d958 100644
|
||||
--- a/cmake/modules/BuildBoost.cmake
|
||||
+++ b/cmake/modules/BuildBoost.cmake
|
||||
@@ -62,7 +62,7 @@ function(do_build_boost version)
|
||||
else()
|
||||
list(APPEND boost_features "address-model=32")
|
||||
endif()
|
||||
- set(BOOST_CXXFLAGS "-fPIC -w") # check on arm, etc <---XXX
|
||||
+ set(BOOST_CXXFLAGS "-fPIC -w -fexceptions -fstack-protector-strong -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -ftemplate-depth-1024 -fno-new-ttp-matching -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free") # check on arm, etc <---XXX
|
||||
list(APPEND boost_features "cxxflags=${BOOST_CXXFLAGS}")
|
||||
|
||||
set(boost_with_libs)
|
||||
Reference in New Issue
Block a user