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 8ac49f54ad774324c1de344cd18620df7fa52256 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.5.5
-

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-init-ceph.in-Allow-custom-cluster-names-during-start.patch

@@ -1,37 +0,0 @@
-From 726127dbd6d51c97495e73c3216c27dd38a31ed3 Mon Sep 17 00:00:00 2001
-From: Anthony Alba <ascanio.alba7@gmail.com>
-Date: Mon, 30 Nov 2015 16:44:31 +0800
-Subject: [PATCH] init-ceph.in: Allow custom cluster names during startup.
-
-Signed-off-by: Richard Chan <richard@treeboxsolutions.com>
----
- src/init-ceph.in | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/init-ceph.in b/src/init-ceph.in
-index e4cea7e..1f19ffa 100644
---- a/src/init-ceph.in
-+++ b/src/init-ceph.in
-@@ -288,7 +288,7 @@ for name in $what; do
- 	lockfile=""
-     fi
- 
--    get_conf asok "$run_dir/ceph-$type.$id.asok" "admin socket"
-+    get_conf asok "$run_dir/$cluster-$type.$id.asok" "admin socket"
- 
-     case "$command" in
- 	start)
-@@ -404,8 +404,8 @@ for name in $what; do
- 		# these keys.  it's also true for legacy installs
- 		# via mkcephfs, which is fine too; there is no harm
- 		# in creating these keys.
--		get_conf mon_data "/var/lib/ceph/mon/ceph-$id" "mon data"
--		if [ "$mon_data" = "/var/lib/ceph/mon/ceph-$id" -a "$asok" = "/var/run/ceph/ceph-mon.$id.asok" ]; then
-+		get_conf mon_data "/var/lib/ceph/mon/$cluster-$id" "mon data"
-+		if [ "$mon_data" = "/var/lib/ceph/mon/$cluster-$id" -a "$asok" = "/var/run/ceph/$cluster-mon.$id.asok" ]; then
- 		    echo Starting ceph-create-keys on $host...
- 		    cmd2="$SBINDIR/ceph-create-keys --cluster $cluster -i $id 2> /dev/null &"
- 		    do_cmd "$cmd2"
--- 
-2.5.5
-

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-Apply-ceph-0.94.1-tcmalloc.patch.patch

@@ -1,26 +0,0 @@
-From ebff005e9998122c9e89052fbca06f4962180240 Mon Sep 17 00:00:00 2001
-From: Boris Ranto <branto@redhat.com>
-Date: Mon, 16 May 2016 15:47:20 +0200
-Subject: [PATCH] Apply 'ceph-0.94.1-tcmalloc.patch'
-
-Signed-off-by: Boris Ranto <branto@redhat.com>
----
- src/rocksdb/configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/rocksdb/configure.ac b/src/rocksdb/configure.ac
-index 855c6a8..fe914aa 100644
---- a/src/rocksdb/configure.ac
-+++ b/src/rocksdb/configure.ac
-@@ -19,7 +19,7 @@ AC_CHECK_LIB([snappy], [snappy_compress], [HAVE_LIBSNAPPY=yes], [AC_MSG_FAILURE(
- 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"
--- 
-2.5.5
-

0004-Apply-init-ceph.in-fedora.patch.patch

@@ -1,32 +0,0 @@
-From ecc0e801e378310dbb0e60ae7eb1f19179bd3e9e Mon Sep 17 00:00:00 2001
-From: Boris Ranto <branto@redhat.com>
-Date: Mon, 16 May 2016 15:48:23 +0200
-Subject: [PATCH] Apply 'init-ceph.in-fedora.patch'
-
-Signed-off-by: Boris Ranto <branto@redhat.com>
----
- src/init-ceph.in | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/init-ceph.in b/src/init-ceph.in
-index 1f19ffa..78eaf97 100644
---- a/src/init-ceph.in
-+++ b/src/init-ceph.in
-@@ -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
--- 
-2.5.5
-

0005-Workaround-xfs.h-check.patch

@@ -1,36 +0,0 @@
-From d02ac8fd60e692da2257a1d963279091ef47e312 Mon Sep 17 00:00:00 2001
-From: Boris Ranto <branto@redhat.com>
-Date: Mon, 16 May 2016 20:53:28 +0200
-Subject: [PATCH] Workaround xfs.h check
-
-The check for <xfs/xfs.h> in fedora 23 is broken. See e.g.:
-
-http://www.spinics.net/lists/ceph-devel/msg29467.html
-
-This should not be too critical and the package should build just fine
-anyway. Commenting out the bits that check for xfs.h should help us,
-here.
-
-Signed-off-by: Boris Ranto <branto@redhat.com>
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index d1f98aa..e068fdb 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -814,8 +814,8 @@ AC_ARG_WITH([libxfs],
-   [with_libxfs=yes])
- AS_IF([test "x$with_libxfs" != "xno"], [
-   # xfs/xfs.h presence and XFS_XFLAG_EXTSIZE define
--  AC_CHECK_HEADER([xfs/xfs.h], [], AC_MSG_ERROR(
--    [xfs/xfs.h not found (--without-libxfs to disable)]))
-+  #AC_CHECK_HEADER([xfs/xfs.h], [], AC_MSG_ERROR(
-+  #  [xfs/xfs.h not found (--without-libxfs to disable)]))
-   AC_MSG_CHECKING([for XFS_XFLAG_EXTSIZE in xfs/xfs.h])
-   AC_EGREP_CPP([yes_have_xfs_xflag_extsize], [
-     #include <xfs/xfs.h>
--- 
-2.5.5
-

sources

@@ -1,3 +1 @@
-e7c35581f8d36d34f7cde16a862e54fb  ceph-0.94.5.tar.bz2
-566cdeae80ee639dcb265ac284a59b48  ceph-0.94.6.tar.gz
-a8fd1046805551e301cb835f418ade72  ceph-0.94.7.tar.gz
+SHA512 (ceph-14.2.0.tar.gz) = c86a335714fd5678988133ec0e60cb10cd948250a133c073d1ed055c5bba232fa6f1e102dd7fcb0c70b37a07c9c2d1220d4a1713720e4dcab9659152ee577480