Compare commits

..

18 Commits
master ... el6

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
6 changed files with 1 additions and 2856 deletions

2
.gitignore vendored
View File

@ -1,2 +0,0 @@
ceph-*.tar.*
*.src.rpm

View File

@ -1,65 +0,0 @@
From a45270a441d483ce57db48cda699a0d2d9c01f18 Mon Sep 17 00:00:00 2001
From: Boris Ranto <branto@redhat.com>
Date: Thu, 28 Feb 2019 00:58:12 +0100
Subject: [PATCH] s390x: A compile hack
Signed-off-by: Boris Ranto <branto@redhat.com>
---
src/rgw/rgw_dmclock_async_scheduler.cc | 2 ++
src/test/rgw/test_rgw_dmclock_scheduler.cc | 8 ++++----
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/rgw/rgw_dmclock_async_scheduler.cc b/src/rgw/rgw_dmclock_async_scheduler.cc
index 18ba5a5e32..08657cf2b5 100644
--- a/src/rgw/rgw_dmclock_async_scheduler.cc
+++ b/src/rgw/rgw_dmclock_async_scheduler.cc
@@ -41,6 +41,7 @@ int AsyncScheduler::schedule_request_impl(const client_id& client,
const Time& time, const Cost& cost,
optional_yield yield_ctx)
{
+#ifdef HAVE_BOOST_CONTEXT
ceph_assert(yield_ctx);
auto &yield = yield_ctx.get_yield_context();
@@ -53,6 +54,7 @@ int AsyncScheduler::schedule_request_impl(const client_id& client,
else
return -ec.value();
}
+#endif
return 0;
}
diff --git a/src/test/rgw/test_rgw_dmclock_scheduler.cc b/src/test/rgw/test_rgw_dmclock_scheduler.cc
index 4e4177cb0b..ddbfd12217 100644
--- a/src/test/rgw/test_rgw_dmclock_scheduler.cc
+++ b/src/test/rgw/test_rgw_dmclock_scheduler.cc
@@ -14,6 +14,8 @@
//#define BOOST_ASIO_ENABLE_HANDLER_TRACKING
+#ifdef HAVE_BOOST_CONTEXT
+
#include "rgw/rgw_dmclock_sync_scheduler.h"
#include "rgw/rgw_dmclock_async_scheduler.h"
@@ -395,8 +397,6 @@ TEST(Queue, CrossExecutorRequest)
EXPECT_EQ(PhaseType::priority, *p2);
}
-#ifdef HAVE_BOOST_CONTEXT
-
TEST(Queue, SpawnAsyncRequest)
{
boost::asio::io_context context;
@@ -426,6 +426,6 @@ TEST(Queue, SpawnAsyncRequest)
EXPECT_TRUE(context.stopped());
}
-#endif
-
} // namespace rgw::dmclock
+
+#endif
--
2.20.1

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}")

2775
ceph.spec

File diff suppressed because it is too large Load Diff

1
dead.package Normal file
View File

@ -0,0 +1 @@
outdated version, no longer supported on el6, obsoleted by packages for el7 in CentOS Storage SIG

View File

@ -1 +0,0 @@
SHA512 (ceph-14.2.0.tar.gz) = c86a335714fd5678988133ec0e60cb10cd948250a133c073d1ed055c5bba232fa6f1e102dd7fcb0c70b37a07c9c2d1220d4a1713720e4dcab9659152ee577480