Compare commits

..

18 Commits

Author SHA1 Message Date
Kaleb S. KEITHLEY 40180d61e7 outdated version, no longer supported on el6, obsoleted by packages for el7 in CentOS Storage SIG 2017-11-21 15:10:14 -05:00
Dan Horák 8d7cd94689 - update Requires for s390(x) 2014-09-09 10:17:27 +02:00
Boris Ranto ae54f50589 Fix bz 1136811 (incorrect symlink on fedora) 2014-09-03 15:39:01 +02:00
Boris Ranto d5d844e547 Second attempt to fix selinux issue (bz 1118504) 2014-08-22 02:06:13 +02:00
Kalev Lember e54974a235 Obsolete ceph-libcephfs
Correct the name of the obsoleted package. It used to be called
"ceph-libcephfs" and not "libcephfs".

Transaction check error:
file /usr/lib64/libcephfs.so.1.0.0 from install of
libcephfs1-1:0.80.5-5.fc21.x86_64 conflicts with file from package
ceph-libcephfs-0.81.0-6.fc21.x86_64
2014-08-17 14:01:14 +02:00
Boris Ranto 0f382eb9c9 Merge branch 'master' into el6 2014-08-16 16:16:09 +02:00
Boris Ranto b81df99ea4 Merge branch 'master' into el6 2014-08-16 11:20:10 +02:00
Kaleb S. KEITHLEY 454fb3d60d Merge remote-tracking branch 'origin' into el6 2014-07-07 08:31:43 -04:00
Kaleb S. KEITHLEY 897c4bbb15 Merge remote-tracking branch 'origin' into el6 2014-07-04 12:56:37 -04:00
Kaleb S. KEITHLEY dc4aea2520 ceph-0.81.0 2014-06-05 02:57:32 -04:00
Kaleb S. KEITHLEY e2514bc7b0 ceph-0.81.0 2014-06-05 02:44:21 -04:00
Kaleb S. KEITHLEY 768e30a6d6 Merge remote-tracking branch 'origin' into el6 2014-06-05 02:32:18 -04:00
Kaleb S. KEITHLEY 38d866465a Merge remote-tracking branch 'origin' into el6 2014-05-14 10:57:43 -04:00
Kaleb S. KEITHLEY 4e33e003a1 Merge remote-tracking branch 'origin' into el6 2014-05-13 21:02:23 -04:00
Josef Bacik bb9f0b064d - fix a sample.conf problem 2013-10-07 12:30:00 +02:00
Dan Horák a7086b93e9 Merge branch 'master' into el6 2013-10-07 12:11:10 +02:00
Josef Bacik d2d8b52247 Merge branch 'master' into el6 2013-09-11 16:13:54 -04:00
Josef Bacik da844afb90 - fix some configure breakage with gperftools and pthread 2013-07-30 13:53:05 -04:00
8 changed files with 1 additions and 3028 deletions
-2
View File
@@ -1,2 +0,0 @@
ceph-*.tar.*
*.src.rpm
-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)
-2950
View File
File diff suppressed because it is too large Load Diff
+1
View File
@@ -0,0 +1 @@
outdated version, no longer supported on el6, obsoleted by packages for el7 in CentOS Storage SIG
-1
View File
@@ -1 +0,0 @@
SHA512 (ceph-14.2.9.tar.gz) = 0a26372d0037c32fe1d24be880e272fcce5089b02adfb0e791e0406155f6e66c913fa43762028f49c1fa3f30c6c8d819c521dd11702a37cc7040dfd3097c068e