Compare commits

..

26 Commits
master ... f21

Author SHA1 Message Date
Boris Ranto af48e05750 Reflect file list changes in the new release 2015-07-22 16:35:10 +02:00
Boris Ranto 21ee093831 Rebase to 0.80.10 2015-07-22 15:55:12 +02:00
Boris Ranto ef6cebb5fd Rebase to 0.80.9 2015-03-11 17:17:02 +01:00
Boris Ranto 61198a290b Fix a typo v2 2015-03-04 19:28:00 +01:00
Boris Ranto c2f40f6bf6 Fix a typo 2015-03-04 19:13:34 +01:00
Boris Ranto cba5e9554c Fix several issues with spec file
- Perform a hardened build
- Use git-formatted patches
- Do not remove conf files on uninstall
- Remove the cleanup post-script function
2015-03-04 19:11:17 +01:00
Boris Ranto c01db1f5b0 Rebase to ceph-0.80.8 2015-02-23 19:14:58 +01:00
Boris Ranto 8e6771dba7 Fix rhbz#1155335 -- /usr/bin/ceph hangs indefinitely 2015-01-14 08:35:02 +01:00
Boris Ranto 615188d81c Can't backport the assert, depends on 'giant' codebase
Just remove the pthread_rwlock_unlock call in destructor to fix the
issue in rhbz#1144794.
2014-12-08 09:41:46 +01:00
Boris Ranto 651026bc41 Fix rhbz#1144794 2014-12-08 08:40:03 +01:00
Boris Ranto 26ff0145e7 Rebase to latest upstream version 2014-10-21 21:24:57 +02:00
Boris Ranto fa0655c5ea Rebase and split ceph-devel, python-ceph packages. provide empty file list for python-ceph-compat and ceph-devel-compat, fix the librados-devel vs librados2-devel problem 2014-10-13 19:54:42 +02:00
Dan Horák 85761f4d79 - update Requires for s390(x) 2014-09-09 10:15:01 +02:00
Boris Ranto a497e4464b Fix bz 1136811 (incorrect symlink on fedora) 2014-09-03 15:32:06 +02:00
Boris Ranto de771f742d Second attempt to fix selinux issue (bz 1118504) 2014-08-22 01:59:32 +02:00
Boris Ranto 95fe85df9e Revert "Modify configure flags to get rid of selinux-related permission denied when loading libraries (bz 1118504)"
This reverts commit c90c05b686.

The patch did not fix the issue.
2014-08-22 01:58:56 +02:00
Boris Ranto c90c05b686 Modify configure flags to get rid of selinux-related permission denied when loading libraries (bz 1118504) 2014-08-21 17:45:41 +02:00
Kalev Lember 711bd40c4e 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-16 23:40:12 +02:00
Boris Ranto a5375edeaf Sync up the spec file with master 2014-08-16 16:07:45 +02:00
Boris Ranto 9db102749d Use the proper version name in Obsoletes, the previous one did not obsolete all the packages that it should 2014-08-16 10:24:11 +02:00
Boris Ranto 7ba3ecfe8f Fix bogus date 2014-08-16 03:53:54 +02:00
Boris Ranto bb93fe97da Fix the dates in changelog 2014-08-16 03:52:03 +02:00
Boris Ranto b833068178 Merge the changes made by rel-eng and fix the dates in changelog 2014-08-16 03:47:54 +02:00
Boris Ranto d5a5e9b77d Add the arm pthread hack 2014-08-16 03:43:51 +02:00
Peter Robinson 1b9a141a37 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild 2014-08-15 23:54:53 +00:00
Boris Ranto 47fe109fff Bump the Epoch, we need to keep the latest stable, not development, ceph version in fedora
- Use the upstream spec file with the ceph-libs split
- Add libs-compat subpackage
- Use fedora in rhel 7 checks
- Obsolete libcephfs
- Depend on redhat-lsb-core for the initscript
2014-08-15 23:22:02 +02:00
7 changed files with 672 additions and 2262 deletions

View File

@ -0,0 +1,27 @@
From 6c280200b42758d3e84cfd1a5b256171cab132d1 Mon Sep 17 00:00:00 2001
From: Boris Ranto <branto@redhat.com>
Date: Wed, 14 Jan 2015 07:46:56 +0100
Subject: [PATCH 1/3] gperftools deprecated google/* includes
---
src/perfglue/heap_profiler.cc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/perfglue/heap_profiler.cc b/src/perfglue/heap_profiler.cc
index 6b079b8..cdd5ccb 100644
--- a/src/perfglue/heap_profiler.cc
+++ b/src/perfglue/heap_profiler.cc
@@ -12,8 +12,8 @@
*
*/
-#include <google/heap-profiler.h>
-#include <google/malloc_extension.h>
+#include <gperftools/heap-profiler.h>
+#include <gperftools/malloc_extension.h>
#include "heap_profiler.h"
#include "common/environment.h"
#include "common/LogClient.h"
--
1.9.3

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

@ -0,0 +1,25 @@
From 213613337d56bf1b1257f043c7b737ee86b0e1be Mon Sep 17 00:00:00 2001
From: Boris Ranto <branto@redhat.com>
Date: Wed, 14 Jan 2015 07:47:47 +0100
Subject: [PATCH 2/3] -Wno-format causes compiler options collision
---
src/test/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/test/Makefile.am b/src/test/Makefile.am
index 69f9e84..9ede275 100644
--- a/src/test/Makefile.am
+++ b/src/test/Makefile.am
@@ -646,7 +646,7 @@ bin_DEBUGPROGRAMS += ceph_test_librbd
if LINUX
ceph_test_librbd_fsx_SOURCES = test/librbd/fsx.c
ceph_test_librbd_fsx_LDADD = $(LIBRBD) $(LIBRADOS) -lm
-ceph_test_librbd_fsx_CFLAGS = ${AM_CFLAGS} -Wno-format
+ceph_test_librbd_fsx_CFLAGS = ${AM_CFLAGS}
bin_DEBUGPROGRAMS += ceph_test_librbd_fsx
endif
--
1.9.3

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

View File

@ -0,0 +1,27 @@
From 149481ac6dc52a852fb53800384a99e3d69ad11a Mon Sep 17 00:00:00 2001
From: Boris Ranto <branto@redhat.com>
Date: Mon, 8 Dec 2014 08:36:37 +0100
Subject: [PATCH 3/3] Backport pull request #2937 to firefly
---
src/common/RWLock.h | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/common/RWLock.h b/src/common/RWLock.h
index f901ac0..f4d1937 100644
--- a/src/common/RWLock.h
+++ b/src/common/RWLock.h
@@ -36,7 +36,9 @@ public:
}
virtual ~RWLock() {
- pthread_rwlock_unlock(&L);
+ // The following check is racy but we are about to destroy
+ // the object and we assume that there are no other users.
+ //assert(!is_locked()); -- hacky backport, no is_locked in firefly
pthread_rwlock_destroy(&L);
}
--
1.9.3

2775
ceph.spec

File diff suppressed because it is too large Load Diff

View File

@ -1 +1 @@
SHA512 (ceph-14.2.0.tar.gz) = c86a335714fd5678988133ec0e60cb10cd948250a133c073d1ed055c5bba232fa6f1e102dd7fcb0c70b37a07c9c2d1220d4a1713720e4dcab9659152ee577480
0bb1d511f39d648035c412c41fd5b8a5 ceph-0.80.10.tar.bz2