Compare commits

..

6 Commits

Author SHA1 Message Date
Tom Callaway 79ba39cd11 rebuild against gperftools 2012-02-16 21:36:29 -05:00
David Nalley f6bd21aaa2 fixing bug 773194 and updating to 0.39 in the process 2012-01-13 14:04:38 -05:00
David Nalley 07057e050a Merge branch 'f16' of ssh://pkgs.fedoraproject.org/ceph into origin/f16 2012-01-13 14:02:10 -05:00
David Nalley 18879ad313 complying with -static lib guidelines bz: 609700 2011-11-09 11:57:37 -05:00
Josef Bacik 0e4cc7c1b7 -forgot to add the logrotate patch 2011-11-07 12:00:43 -05:00
Josef Bacik 8cb6eae323 -updating ceph in f16 to 0.37 2011-11-07 11:54:54 -05:00
9 changed files with 219 additions and 2893 deletions
+7 -2
View File
@@ -1,2 +1,7 @@
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
-13
View File
@@ -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}")
-13
View File
@@ -1,13 +0,0 @@
--- ceph-14.2.6/src/common/bit_str.h.orig 2020-01-24 11:37:20.547679336 -0500
+++ ceph-14.2.6/src/common/bit_str.h 2020-01-24 11:37:55.351904895 -0500
@@ -14,7 +14,10 @@
#ifndef CEPH_COMMON_BIT_STR_H
#define CEPH_COMMON_BIT_STR_H
+#include <cstdint>
+#include <iosfwd>
#include <functional>
+#include <ostream>
namespace ceph {
class Formatter;
-10
View File
@@ -1,10 +0,0 @@
--- ceph-14.2.6/src/librbd/api/PoolMetadata.h.orig 2020-01-24 12:39:23.738816885 -0500
+++ ceph-14.2.6/src/librbd/api/PoolMetadata.h 2020-01-24 12:39:36.522902386 -0500
@@ -8,6 +8,7 @@
#include "include/rados/librados_fwd.hpp"
#include <map>
+#include <string>
namespace librbd {
@@ -1,39 +0,0 @@
--- a/cmake/modules/CheckCxxAtomic.cmake 2020-03-02 12:49:20.000000000 -0500
+++ b/cmake/modules/CheckCxxAtomic.cmake 2020-01-29 12:53:56.952149798 -0500
@@ -10,18 +10,29 @@
check_cxx_source_compiles("
#include <atomic>
#include <cstdint>
+
+#if __s390x__
+// Boost needs 16-byte atomics for tagged pointers.
+// These are implemented via inline instructions on the platform
+// if 16-byte alignment can be proven, and are delegated to libatomic
+// library routines otherwise. Whether or not alignment is provably
+// OK for a std::atomic unfortunately depends on compiler version and
+// optimization levels, and also on the details of the expression.
+// 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<unsigned __int128> *ptr)
+{
+ return *ptr != 0;
+}
+#endif
+
int main() {
std::atomic<uint8_t> w1;
std::atomic<uint16_t> w2;
std::atomic<uint32_t> w4;
std::atomic<uint64_t> w8;
-#ifdef __s390x__
- // Boost needs 16-byte atomics for tagged pointers.
- std::atomic<unsigned __int128> w16;
-#else
- #define w16 0
-#endif
- return w1 + w2 + w4 + w8 + w16;
+ return w1 + w2 + w4 + w8;
}
" ${var})
endfunction(check_cxx_atomics)
+17
View File
@@ -0,0 +1,17 @@
--- ceph-0.21.1/src/init-ceph.in.orig 2010-07-29 15:16:49.000000000 -0500
+++ ceph-0.21.1/src/init-ceph.in 2010-08-26 14:58:25.328581937 -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 4 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
+11
View File
@@ -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
}
+183 -2815
View File
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -1 +1 @@
SHA512 (ceph-14.2.9.tar.gz) = 0a26372d0037c32fe1d24be880e272fcce5089b02adfb0e791e0406155f6e66c913fa43762028f49c1fa3f30c6c8d819c521dd11702a37cc7040dfd3097c068e
8dcc078604c54d10085b6990ef554738 ceph-0.39.tar.gz