sys-cluster/ceph: Version bump to 12.2.0

Package-Manager: Portage-2.3.8, Repoman-2.3.3

2 files changed, 83 insertions, 0 deletions

diff --git a/sys-cluster/ceph/files/ceph-12.2.0-fix_two_stray_get_health_callers.patch b/sys-cluster/ceph/files/ceph-12.2.0-fix_two_stray_get_health_callers.patch
new file mode 100644
index 000000000000..ec6f53ef4612
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-12.2.0-fix_two_stray_get_health_callers.patch
@@ -0,0 +1,46 @@
+commit b713cc831da238844a6e42e80e93cb31ee060aad
+Author: Sage Weil <sage@redhat.com>
+Date:   Fri Aug 25 18:30:12 2017 -0400
+
+    mon: fix two stray legacy get_health() callers
+    
+    These need to call the new method when appropriate.
+    
+    Signed-off-by: Sage Weil <sage@redhat.com>
+    (cherry picked from commit 69038a18070d0cd47dc857020cce115514beaa3d)
+
+diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
+index d98a40967b..b330d78f8c 100644
+--- a/src/mon/Monitor.cc
++++ b/src/mon/Monitor.cc
+@@ -3363,8 +3363,12 @@ void Monitor::handle_command(MonOpRequestRef op)
+       tagstr = tagstr.substr(0, tagstr.find_last_of(' '));
+     f->dump_string("tag", tagstr);
+ 
+-    list<string> hs;
+-    get_health(hs, NULL, f.get());
++    if (osdmon()->osdmap.require_osd_release >= CEPH_RELEASE_LUMINOUS) {
++      get_health_status(true, f.get(), nullptr);
++    } else {
++      list<string> health_str;
++      get_health(health_str, nullptr, f.get());
++    }
+ 
+     monmon()->dump_info(f.get());
+     osdmon()->dump_info(f.get());
+@@ -4399,8 +4403,13 @@ void Monitor::handle_ping(MonOpRequestRef op)
+   boost::scoped_ptr<Formatter> f(new JSONFormatter(true));
+   f->open_object_section("pong");
+ 
+-  list<string> health_str;
+-  get_health(health_str, NULL, f.get());
++  if (osdmon()->osdmap.require_osd_release >= CEPH_RELEASE_LUMINOUS) {
++    get_health_status(false, f.get(), nullptr);
++  } else {
++    list<string> health_str;
++    get_health(health_str, nullptr, f.get());
++  }
++
+   {
+     stringstream ss;
+     get_mon_status(f.get(), ss);
diff --git a/sys-cluster/ceph/files/ceph-12.2.0-use-provided-cpu-flag-values.patch b/sys-cluster/ceph/files/ceph-12.2.0-use-provided-cpu-flag-values.patch
new file mode 100644
index 000000000000..55c82b0a272b
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-12.2.0-use-provided-cpu-flag-values.patch
@@ -0,0 +1,37 @@
+diff --git a/cmake/modules/SIMDExt.cmake b/cmake/modules/SIMDExt.cmake
+index 5330835aa1..a4dd881e34 100644
+--- a/cmake/modules/SIMDExt.cmake
++++ b/cmake/modules/SIMDExt.cmake
+@@ -76,32 +76,25 @@ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "arm|ARM")
+ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "i386|i686|amd64|x86_64|AMD64")
+   set(HAVE_INTEL 1)
+   if(CMAKE_SYSTEM_PROCESSOR MATCHES "i686|amd64|x86_64|AMD64")
+-    CHECK_C_COMPILER_FLAG(-msse HAVE_INTEL_SSE)
+     if(HAVE_INTEL_SSE)
+       set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -msse")
+     endif()
+     if(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64|x86_64|AMD64")
+-      CHECK_C_COMPILER_FLAG(-msse2 HAVE_INTEL_SSE2)
+       if(HAVE_INTEL_SSE2)
+         set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -msse2")
+       endif()
+-      CHECK_C_COMPILER_FLAG(-msse3 HAVE_INTEL_SSE3)
+       if(HAVE_INTEL_SSE3)
+         set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -msse3")
+       endif()
+-      CHECK_C_COMPILER_FLAG(-mssse3 HAVE_INTEL_SSSE3)
+       if(HAVE_INTEL_SSSE3)
+         set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -mssse3")
+       endif()
+-      CHECK_C_COMPILER_FLAG(-mpclmul HAVE_INTEL_PCLMUL)
+       if(HAVE_INTEL_PCLMUL)
+         set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -mpclmul")
+       endif()
+-      CHECK_C_COMPILER_FLAG(-msse4.1 HAVE_INTEL_SSE4_1)
+       if(HAVE_INTEL_SSE4_1)
+         set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -msse4.1")
+       endif()
+-      CHECK_C_COMPILER_FLAG(-msse4.2 HAVE_INTEL_SSE4_2)
+       if(HAVE_INTEL_SSE4_2)
+         set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -msse4.2")
+       endif()