dist-git conversion

.gitignore

@@ -1,2 +1 @@
-ceph-*.tar.*
-*.src.rpm
+ceph-0.20.2.tar.gz

0002-src-common-CMakeLists.txt.patch

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

0003-src-common-bitstr.h.patch

@@ -1,13 +0,0 @@
---- ceph-14.2.6/src/common/bit_str.h.orig	2020-01-24 11:37:20.547679336 -0500
-+++ ceph-14.2.6/src/common/bit_str.h	2020-01-24 11:37:55.351904895 -0500
-@@ -14,7 +14,10 @@
- #ifndef CEPH_COMMON_BIT_STR_H
- #define CEPH_COMMON_BIT_STR_H
- 
-+#include <cstdint>
-+#include <iosfwd>
- #include <functional>
-+#include <ostream>
- 
- namespace ceph {
-   class Formatter;

0004-src-librbd-api-PoolMetadata.h.patch

@@ -1,10 +0,0 @@
---- ceph-14.2.6/src/librbd/api/PoolMetadata.h.orig	2020-01-24 12:39:23.738816885 -0500
-+++ ceph-14.2.6/src/librbd/api/PoolMetadata.h	2020-01-24 12:39:36.522902386 -0500
-@@ -8,6 +8,7 @@
- #include "include/rados/librados_fwd.hpp"
- 
- #include <map>
-+#include <string>
- 
- namespace librbd {
- 

0005-cmake-modules-CheckCxxAtomic.cmake.patch

@@ -1,39 +0,0 @@
---- a/cmake/modules/CheckCxxAtomic.cmake	2020-03-02 12:49:20.000000000 -0500
-+++ b/cmake/modules/CheckCxxAtomic.cmake	2020-01-29 12:53:56.952149798 -0500
-@@ -10,18 +10,29 @@
-     check_cxx_source_compiles("
- #include <atomic>
- #include <cstdint>
-+
-+#if __s390x__
-+// Boost needs 16-byte atomics for tagged pointers.
-+// These are implemented via inline instructions on the platform
-+// if 16-byte alignment can be proven, and are delegated to libatomic
-+// library routines otherwise.  Whether or not alignment is provably
-+// OK for a std::atomic unfortunately depends on compiler version and
-+// optimization levels, and also on the details of the expression.
-+// We specifically test access via an otherwise unknown pointer here
-+// to ensure we get the most complex case.  If this access can be
-+// done without libatomic, then all accesses can be done.
-+bool atomic16(std::atomic<unsigned __int128> *ptr)
-+{
-+  return *ptr != 0;
-+}
-+#endif
-+
- int main() {
-   std::atomic<uint8_t> w1;
-   std::atomic<uint16_t> w2;
-   std::atomic<uint32_t> w4;
-   std::atomic<uint64_t> w8;
--#ifdef __s390x__
--  // Boost needs 16-byte atomics for tagged pointers.
--  std::atomic<unsigned __int128> w16;
--#else
--  #define w16 0
--#endif
--  return w1 + w2 + w4 + w8 + w16;
-+  return w1 + w2 + w4 + w8;
- }
- " ${var})
- endfunction(check_cxx_atomics)

ceph-init-fix.patch

@@ -0,0 +1,62 @@
+diff -up ceph-0.20/src/init-ceph.in.init ceph-0.20/src/init-ceph.in
+--- ceph-0.20/src/init-ceph.in.init	2010-04-22 16:11:34.000000000 -0400
++++ ceph-0.20/src/init-ceph.in	2010-05-05 15:37:11.185677759 -0400
+@@ -1,10 +1,11 @@
+ #!/bin/sh
+ # Start/stop ceph daemons
++# 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
+@@ -28,6 +29,8 @@ else
+     fi
+ fi
+ 
++lockfile=/var/lock/subsys/ceph
++
+ usage_exit() {
+     echo "usage: $0 [options] {start|stop|restart} [mon|osd|mds]..."
+     printf "\t-c ceph.conf\n"
+@@ -244,6 +247,7 @@ for name in $what; do
+ 	    [ -n "$pre_start" ] && do_cmd "$pre_start"
+ 	    do_cmd "$cmd" $runarg
+ 	    [ -n "$post_start" ] && do_cmd "$post_start"
++	    [ "$?" = 0 ] && touch $lockfile
+ 	    ;;
+ 	
+ 	stop)
+@@ -252,19 +256,27 @@ for name in $what; do
+ 	    [ -n "$pre_stop" ] && do_cmd "$pre_stop"
+ 	    stop_daemon $name c$type $pid_file
+ 	    [ -n "$post_stop" ] && do_cmd "$post_stop"
++	    [ "$?" = 0 ] && rm -f $lockfile
+ 	    ;;
+ 
++	status)
++	    pid=`cat $pid_file`
++	    ps $pid &> /dev/null
++	    exit $?
++	    ;;
+ 	forcestop)
+ 	    get_conf pre_forcestop "" "pre forcestop command"
+ 	    get_conf post_forcestop "" "post forcestop command"
+ 	    [ -n "$pre_forcestop" ] && do_cmd "$pre_forcestop"
+ 	    stop_daemon $name c$type $pid_file -9
+ 	    [ -n "$post_forcestop" ] && do_cmd "$post_forcestop"
++	    [ "$?" = 0 ] && rm -f $lockfile
+ 	    ;;
+ 	    
+ 	killall)
+ 	    echo "killall c$type on $host"
+ 	    do_cmd "pkill ^c$type || true"
++	    [ "$?" = 0 ] && rm -f $lockfile
+ 	    ;;
+ 	
+ 	force-reload | reload)

sources

@@ -1 +1 @@
-SHA512 (ceph-14.2.9.tar.gz) = 0a26372d0037c32fe1d24be880e272fcce5089b02adfb0e791e0406155f6e66c913fa43762028f49c1fa3f30c6c8d819c521dd11702a37cc7040dfd3097c068e
+74e6f398d320bf1dd46db91210198dd9  ceph-0.20.2.tar.gz