ceph 14.2.0 GA

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

0001-Disable-erasure_codelib-neon-build.patch

@@ -1,29 +0,0 @@
-From 8b0b78dc06ae1ed1c5f3c7a13271e7037091d0be Mon Sep 17 00:00:00 2001
-From: Boris Ranto <branto@redhat.com>
-Date: Wed, 15 Apr 2015 14:06:24 +0200
-Subject: [PATCH] Disable erasure_codelib neon build
-
----
- src/erasure-code/jerasure/Makefile.am | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/erasure-code/jerasure/Makefile.am b/src/erasure-code/jerasure/Makefile.am
-index 9ca4fbb..147d57e 100644
---- a/src/erasure-code/jerasure/Makefile.am
-+++ b/src/erasure-code/jerasure/Makefile.am
-@@ -75,9 +75,9 @@ if LINUX
- libec_jerasure_neon_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
- endif
- 
--if HAVE_NEON
--erasure_codelib_LTLIBRARIES += libec_jerasure_neon.la
--endif
-+#if HAVE_NEON
-+#erasure_codelib_LTLIBRARIES += libec_jerasure_neon.la
-+#endif
- 
- libec_jerasure_sse3_la_SOURCES = ${jerasure_sources}
- libec_jerasure_sse3_la_CFLAGS = ${AM_CFLAGS}  \
--- 
-2.1.0
-

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-Add-support-for-PPC-arch.patch

@@ -1,33 +0,0 @@
-From b2781fb5638afae7438b983a912ede126a8c5b85 Mon Sep 17 00:00:00 2001
-From: James Page <james.page@ubuntu.com>
-Date: Fri, 13 Mar 2015 19:46:04 +0000
-Subject: [PATCH] Add support for PPC architecture, provide fallback
-
-Add high precision cpu cycles support for powerpc and powerpc64.
-
-Provide a fallback for other architectures and warn during
-compilation.
-
-Signed-off-by: James Page <james.page@ubuntu.com>
-
-diff --git a/src/common/Cycles.h b/src/common/Cycles.h
-index 6e47cde..bb47d5c 100644
---- a/src/common/Cycles.h
-+++ b/src/common/Cycles.h
-@@ -72,8 +72,15 @@ class Cycles {
-     uint64_t cntvct;
-     asm volatile ("isb; mrs %0, cntvct_el0; isb; " : "=r" (cntvct) :: "memory");
-     return cntvct;
-+#elif defined(__powerpc__) || defined (__powerpc64__)
-+    // Based on:
-+    // https://github.com/randombit/botan/blob/net.randombit.botan/src/lib/entropy/hres_timer/hres_timer.cpp
-+    uint32_t lo = 0, hi = 0;
-+    asm volatile("mftbu %0; mftb %1" : "=r" (hi), "=r" (lo));
-+    return (((uint64_t)hi << 32) | lo);
- #else
--#error No high-precision counter available for your OS/arch
-+#warning No high-precision counter available for your OS/arch
-+    return 0;
- #endif
-   }
- 

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

0003-Skip-initialization-if-rtdsc-is-not-implemented.patch

@@ -1,33 +0,0 @@
-From fdd728c0872b34d1b6f96ee5601b619748afc9e8 Mon Sep 17 00:00:00 2001
-From: Boris Ranto <branto@redhat.com>
-Date: Mon, 18 May 2015 20:27:56 +0200
-Subject: [PATCH] Skip initialization if rtdsc is not implemented
-
-Patch by James Page. See
-
-https://bugs.launchpad.net/ubuntu/+source/ceph/+bug/1432786
-
-for more details.
----
- src/common/Cycles.cc | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/common/Cycles.cc b/src/common/Cycles.cc
-index a2efcf3..a5367f7 100644
---- a/src/common/Cycles.cc
-+++ b/src/common/Cycles.cc
-@@ -52,6 +52,11 @@ void Cycles::init()
-   if (cycles_per_sec != 0)
-     return;
- 
-+
-+  // Skip initialization if rtdsc is not implemented
-+  if (rdtsc() == 0)
-+    return;
-+
-   // Compute the frequency of the fine-grained CPU timer: to do this,
-   // take parallel time readings using both rdtsc and gettimeofday.
-   // After 10ms have elapsed, take the ratio between these readings.
--- 
-2.1.0
-

ceph-0.94.1-tcmalloc.patch

@@ -1,12 +0,0 @@
-diff -up ceph-0.94.1/src/rocksdb/configure.ac.tcmalloc ceph-0.94.1/src/rocksdb/configure.ac
---- ceph-0.94.1/src/rocksdb/configure.ac.tcmalloc	2015-06-08 14:03:27.000000000 +0200
-+++ ceph-0.94.1/src/rocksdb/configure.ac	2015-06-08 14:03:41.000000000 +0200
-@@ -19,7 +19,7 @@ AC_CHECK_LIB([snappy], [snappy_compress]
- AC_CHECK_LIB([z], [gzread], [HAVE_LIBZ=yes], [AC_MSG_FAILURE([libz not found])])
- AC_CHECK_LIB([bz2], [BZ2_bzCompressInit], [HAVE_LIBBZ2=yes], [AC_MSG_FAILURE([libbz2 not found])])
- AC_CHECK_LIB([rt], [clock_gettime], [HAVE_LIBRT=yes], [AC_MSG_FAILURE([librt not found])])
--AC_CHECK_LIB([tcmalloc], [malloc],  [HAVE_LIBTCMALLOC=yes],[AC_MSG_FAILURE([no tcmalloc found ])])
-+AC_CHECK_LIB([tcmalloc], [malloc],  [HAVE_LIBTCMALLOC=yes],[AC_MSG_RESULT([no tcmalloc found ])])
- 
- OLD_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS -std=c++11"

init-ceph.in-fedora.patch

@@ -1,18 +0,0 @@
-diff -up ceph-0.46/src/init-ceph.in.orig ceph-0.46/src/init-ceph.in
---- ceph-0.46/src/init-ceph.in.orig	2012-04-24 16:06:39.000000000 -0400
-+++ ceph-0.46/src/init-ceph.in	2012-05-09 16:41:36.500004052 -0400
-@@ -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

sources

@@ -1,2 +1 @@
-00d910ac57529be846e31a04bc4ab84e  ceph-0.87.1.tar.bz2
-e4a625aa2c91fe5d3f0c62faa4716ca2  ceph-0.94.1.tar.bz2
+SHA512 (ceph-14.2.0.tar.gz) = c86a335714fd5678988133ec0e60cb10cd948250a133c073d1ed055c5bba232fa6f1e102dd7fcb0c70b37a07c9c2d1220d4a1713720e4dcab9659152ee577480