ceph 14.2.0 GA

Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>

0001-s390x-A-compile-hack.patch

@@ -0,0 +1,65 @@
+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
+

0002-src-common-CMakeLists.txt.patch

@@ -0,0 +1,13 @@
+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}")

ceph-google-gperftools.patch

@@ -1,13 +0,0 @@
---- ceph-0.80.5/src/perfglue/heap_profiler.cc.orig	2014-08-15 16:05:00.161794290 +0200
-+++ ceph-0.80.5/src/perfglue/heap_profiler.cc	2014-08-15 16:05:04.691794305 +0200
-@@ -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"

ceph-no-format-security.patch

@@ -1,11 +0,0 @@
---- ceph-0.80.5/src/test/Makefile.am.orig	2014-08-15 16:30:18.831799418 +0200
-+++ ceph-0.80.5/src/test/Makefile.am	2014-08-15 16:23:17.758464663 +0200
-@@ -642,7 +642,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
- 

sources

@@ -1 +1 @@
-c57f6887f6097f95ad2c3b169a94f811  ceph-0.80.5.tar.bz2
+SHA512 (ceph-14.2.0.tar.gz) = c86a335714fd5678988133ec0e60cb10cd948250a133c073d1ed055c5bba232fa6f1e102dd7fcb0c70b37a07c9c2d1220d4a1713720e4dcab9659152ee577480