dist-git conversion

.gitignore

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

0001-Disable-erasure_codelib-neon-build.patch

@@ -1,47 +0,0 @@
-From 2a7810f39cb113570efcde5f65e5440ff9587ae0 Mon Sep 17 00:00:00 2001
-From: Boris Ranto <branto@redhat.com>
-Date: Wed, 11 Nov 2015 17:08:06 +0100
-Subject: [PATCH] Disable erasure_codelib neon build
-
----
- src/erasure-code/jerasure/Makefile.am | 6 +++---
- src/erasure-code/shec/Makefile.am     | 6 +++---
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/src/erasure-code/jerasure/Makefile.am b/src/erasure-code/jerasure/Makefile.am
-index 6ffe3ed..01f5112 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}  \
-diff --git a/src/erasure-code/shec/Makefile.am b/src/erasure-code/shec/Makefile.am
-index cd93132..948979b 100644
---- a/src/erasure-code/shec/Makefile.am
-+++ b/src/erasure-code/shec/Makefile.am
-@@ -81,9 +81,9 @@ if LINUX
- libec_shec_neon_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
- endif
- 
--if HAVE_NEON
--erasure_codelib_LTLIBRARIES += libec_shec_neon.la
--endif
-+#if HAVE_NEON
-+#erasure_codelib_LTLIBRARIES += libec_shec_neon.la
-+#endif
- 
- libec_shec_sse3_la_SOURCES = ${shec_sources}
- libec_shec_sse3_la_CFLAGS = ${AM_CFLAGS}  \
--- 
-2.7.4
-

0002-msg-simple-Pipe-avoid-returning-0-on-poll-timeout.patch

@@ -1,43 +0,0 @@
-From f7abffec751e454d119df273dc6e49e5f7106078 Mon Sep 17 00:00:00 2001
-From: Sage Weil <sage@redhat.com>
-Date: Wed, 7 Dec 2016 18:25:55 -0600
-Subject: [PATCH] msg/simple/Pipe: avoid returning 0 on poll timeout
-
-If poll times out it will return 0 (no data to read on socket).  In
-165e5abdbf6311974d4001e43982b83d06f9e0cc we changed tcp_read_wait from
-returning -1 to returning -errno, which means we return 0 instead of -1
-in this case.
-
-This makes tcp_read() get into an infinite loop by repeatedly trying to
-read from the socket and getting EAGAIN.
-
-Fix by explicitly checking for a 0 return from poll(2) and returning
-EAGAIN in that case.
-
-Fixes: http://tracker.ceph.com/issues/18184
-Signed-off-by: Sage Weil <sage@redhat.com>
-(cherry picked from commit 6c3d015c6854a12cda40673848813d968ff6afae)
----
- src/msg/simple/Pipe.cc | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/msg/simple/Pipe.cc b/src/msg/simple/Pipe.cc
-index 80b948d..cfb1986 100644
---- a/src/msg/simple/Pipe.cc
-+++ b/src/msg/simple/Pipe.cc
-@@ -2500,8 +2500,11 @@ int Pipe::tcp_read_wait()
-   if (has_pending_data())
-     return 0;
- 
--  if (poll(&pfd, 1, msgr->timeout) <= 0)
-+  int r = poll(&pfd, 1, msgr->timeout);
-+  if (r < 0)
-     return -errno;
-+  if (r == 0)
-+    return -EAGAIN;
- 
-   evmask = POLLERR | POLLHUP | POLLNVAL;
- #if defined(__linux__)
--- 
-2.7.4
-

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 @@
-ae84a14d93d0b7cc4fa59bac0c79746f  ceph-10.2.4.tar.gz
+74e6f398d320bf1dd46db91210198dd9  ceph-0.20.2.tar.gz