Compare commits
26 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
af48e05750 | ||
|
21ee093831 | ||
|
ef6cebb5fd | ||
|
61198a290b | ||
|
c2f40f6bf6 | ||
|
cba5e9554c | ||
|
c01db1f5b0 | ||
|
8e6771dba7 | ||
|
615188d81c | ||
|
651026bc41 | ||
|
26ff0145e7 | ||
|
fa0655c5ea | ||
|
85761f4d79 | ||
|
a497e4464b | ||
|
de771f742d | ||
|
95fe85df9e | ||
|
c90c05b686 | ||
|
711bd40c4e | ||
|
a5375edeaf | ||
|
9db102749d | ||
|
7ba3ecfe8f | ||
|
bb93fe97da | ||
|
b833068178 | ||
|
d5a5e9b77d | ||
|
1b9a141a37 | ||
|
47fe109fff |
27
0001-gperftools-deprecated-google-includes.patch
Normal file
27
0001-gperftools-deprecated-google-includes.patch
Normal file
@ -0,0 +1,27 @@
|
||||
From 6c280200b42758d3e84cfd1a5b256171cab132d1 Mon Sep 17 00:00:00 2001
|
||||
From: Boris Ranto <branto@redhat.com>
|
||||
Date: Wed, 14 Jan 2015 07:46:56 +0100
|
||||
Subject: [PATCH 1/3] gperftools deprecated google/* includes
|
||||
|
||||
---
|
||||
src/perfglue/heap_profiler.cc | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/perfglue/heap_profiler.cc b/src/perfglue/heap_profiler.cc
|
||||
index 6b079b8..cdd5ccb 100644
|
||||
--- a/src/perfglue/heap_profiler.cc
|
||||
+++ b/src/perfglue/heap_profiler.cc
|
||||
@@ -12,8 +12,8 @@
|
||||
*
|
||||
*/
|
||||
|
||||
-#include <google/heap-profiler.h>
|
||||
-#include <google/malloc_extension.h>
|
||||
+#include <gperftools/heap-profiler.h>
|
||||
+#include <gperftools/malloc_extension.h>
|
||||
#include "heap_profiler.h"
|
||||
#include "common/environment.h"
|
||||
#include "common/LogClient.h"
|
||||
--
|
||||
1.9.3
|
||||
|
25
0002-Wno-format-causes-compiler-options-collision.patch
Normal file
25
0002-Wno-format-causes-compiler-options-collision.patch
Normal file
@ -0,0 +1,25 @@
|
||||
From 213613337d56bf1b1257f043c7b737ee86b0e1be Mon Sep 17 00:00:00 2001
|
||||
From: Boris Ranto <branto@redhat.com>
|
||||
Date: Wed, 14 Jan 2015 07:47:47 +0100
|
||||
Subject: [PATCH 2/3] -Wno-format causes compiler options collision
|
||||
|
||||
---
|
||||
src/test/Makefile.am | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/test/Makefile.am b/src/test/Makefile.am
|
||||
index 69f9e84..9ede275 100644
|
||||
--- a/src/test/Makefile.am
|
||||
+++ b/src/test/Makefile.am
|
||||
@@ -646,7 +646,7 @@ bin_DEBUGPROGRAMS += ceph_test_librbd
|
||||
if LINUX
|
||||
ceph_test_librbd_fsx_SOURCES = test/librbd/fsx.c
|
||||
ceph_test_librbd_fsx_LDADD = $(LIBRBD) $(LIBRADOS) -lm
|
||||
-ceph_test_librbd_fsx_CFLAGS = ${AM_CFLAGS} -Wno-format
|
||||
+ceph_test_librbd_fsx_CFLAGS = ${AM_CFLAGS}
|
||||
bin_DEBUGPROGRAMS += ceph_test_librbd_fsx
|
||||
endif
|
||||
|
||||
--
|
||||
1.9.3
|
||||
|
27
0003-Backport-pull-request-2937-to-firefly.patch
Normal file
27
0003-Backport-pull-request-2937-to-firefly.patch
Normal file
@ -0,0 +1,27 @@
|
||||
From 149481ac6dc52a852fb53800384a99e3d69ad11a Mon Sep 17 00:00:00 2001
|
||||
From: Boris Ranto <branto@redhat.com>
|
||||
Date: Mon, 8 Dec 2014 08:36:37 +0100
|
||||
Subject: [PATCH 3/3] Backport pull request #2937 to firefly
|
||||
|
||||
---
|
||||
src/common/RWLock.h | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/common/RWLock.h b/src/common/RWLock.h
|
||||
index f901ac0..f4d1937 100644
|
||||
--- a/src/common/RWLock.h
|
||||
+++ b/src/common/RWLock.h
|
||||
@@ -36,7 +36,9 @@ public:
|
||||
}
|
||||
|
||||
virtual ~RWLock() {
|
||||
- pthread_rwlock_unlock(&L);
|
||||
+ // The following check is racy but we are about to destroy
|
||||
+ // the object and we assume that there are no other users.
|
||||
+ //assert(!is_locked()); -- hacky backport, no is_locked in firefly
|
||||
pthread_rwlock_destroy(&L);
|
||||
}
|
||||
|
||||
--
|
||||
1.9.3
|
||||
|
@ -1,40 +0,0 @@
|
||||
--- ceph-0.81/src/Makefile.in.orig 2014-07-02 09:07:44.888133273 -0400
|
||||
+++ ceph-0.81/src/Makefile.in 2014-07-03 13:32:30.213133273 -0400
|
||||
@@ -3875,6 +3875,7 @@
|
||||
${WARN_IGNORED_QUALIFIERS} \
|
||||
-Winit-self \
|
||||
-Wpointer-arith \
|
||||
+ -Wformat \
|
||||
-Werror=format-security \
|
||||
-fno-strict-aliasing \
|
||||
-fsigned-char
|
||||
@@ -4928,7 +4929,7 @@
|
||||
@LINUX_TRUE@ceph_test_librbd_fsx_SOURCES = test/librbd/fsx.c
|
||||
@LINUX_TRUE@nodist_EXTRA_ceph_test_librbd_fsx_SOURCES = dummy.cc # force c++ linking
|
||||
@LINUX_TRUE@ceph_test_librbd_fsx_LDADD = $(LIBKRBD) $(LIBRBD) $(LIBRADOS)
|
||||
-@LINUX_TRUE@ceph_test_librbd_fsx_CFLAGS = ${AM_CFLAGS} -Wno-format
|
||||
+@LINUX_TRUE@ceph_test_librbd_fsx_CFLAGS = ${AM_CFLAGS}
|
||||
ceph_test_cls_rbd_SOURCES = test/cls_rbd/test_cls_rbd.cc
|
||||
ceph_test_cls_rbd_LDADD = $(LIBRADOS) libcls_rbd_client.la libcls_lock_client.la $(UNITTEST_LDADD) $(RADOS_TEST_LDADD)
|
||||
ceph_test_cls_rbd_CXXFLAGS = $(UNITTEST_CXXFLAGS)
|
||||
--- ceph-0.81/src/Makefile-env.am.orig 2014-07-02 09:23:02.126133273 -0400
|
||||
+++ ceph-0.81/src/Makefile-env.am 2014-07-03 11:50:14.063133273 -0400
|
||||
@@ -64,6 +64,7 @@
|
||||
${WARN_IGNORED_QUALIFIERS} \
|
||||
-Winit-self \
|
||||
-Wpointer-arith \
|
||||
+ -Wformat \
|
||||
-Werror=format-security \
|
||||
-fno-strict-aliasing \
|
||||
-fsigned-char
|
||||
--- ceph-0.81/src/test/Makefile.am.orig 2014-07-04 06:36:22.016099589 -0400
|
||||
+++ ceph-0.81/src/test/Makefile.am 2014-07-04 06:37:26.156099589 -0400
|
||||
@@ -642,7 +642,7 @@
|
||||
ceph_test_librbd_fsx_SOURCES = test/librbd/fsx.c
|
||||
nodist_EXTRA_ceph_test_librbd_fsx_SOURCES = dummy.cc # force c++ linking
|
||||
ceph_test_librbd_fsx_LDADD = $(LIBKRBD) $(LIBRBD) $(LIBRADOS)
|
||||
-ceph_test_librbd_fsx_CFLAGS = ${AM_CFLAGS} -Wno-format
|
||||
+ceph_test_librbd_fsx_CFLAGS = ${AM_CFLAGS}
|
||||
bin_DEBUGPROGRAMS += ceph_test_librbd_fsx
|
||||
endif
|
||||
|
@ -1,14 +0,0 @@
|
||||
--- ceph-0.81/configure.ac.orig 2014-07-04 10:00:39.193099589 -0400
|
||||
+++ ceph-0.81/configure.ac 2014-07-04 10:03:54.739099589 -0400
|
||||
@@ -425,9 +425,9 @@
|
||||
# the search path.
|
||||
AS_IF([test "x$with_debug" = "xyes"], [
|
||||
dir='/usr/share/java'
|
||||
- junit4_jar=`find $dir -name junit4.jar | head -n 1`
|
||||
+ junit4_jar=`find $dir -name junit.jar | head -n 1`
|
||||
AS_IF([test -r "$junit4_jar"], [
|
||||
- EXTRA_CLASSPATH_JAR=`dirname $junit4_jar`/junit4.jar
|
||||
+ EXTRA_CLASSPATH_JAR=`dirname $junit4_jar`/junit.jar
|
||||
AC_SUBST(EXTRA_CLASSPATH_JAR)
|
||||
[have_junit4=1]], [
|
||||
AC_MSG_NOTICE([Cannot find junit4.jar (apt-get install junit4)])
|
@ -1,11 +0,0 @@
|
||||
--- ceph-0.81/src/test/librbd/fsx.c.orig 2014-07-04 07:23:03.485099589 -0400
|
||||
+++ ceph-0.81/src/test/librbd/fsx.c 2014-07-04 08:11:04.208099589 -0400
|
||||
@@ -1360,7 +1360,7 @@
|
||||
int ret, fd;
|
||||
struct rbd_ctx cur_ctx = RBD_CTX_INIT;
|
||||
struct stat file_info;
|
||||
- char *good_buf, *temp_buf;
|
||||
+ char *good_buf, *temp_buf = NULL;
|
||||
|
||||
clone_imagename(imagename, sizeof(imagename), clonenum);
|
||||
if ((ret = ops->open(imagename, &cur_ctx)) < 0) {
|
@ -1,13 +0,0 @@
|
||||
diff -urb ceph-0.51/configure.ac ceph-0.51b/configure.ac
|
||||
--- ceph-0.51/configure.ac 2012-08-26 01:58:14.000000000 +0300
|
||||
+++ ceph-0.51b/configure.ac 2012-09-24 09:19:20.791969694 +0300
|
||||
@@ -17,6 +17,9 @@
|
||||
AC_CANONICAL_HOST
|
||||
AC_CANONICAL_TARGET
|
||||
|
||||
+# fix automake problems in 1.12
|
||||
+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
|
||||
+
|
||||
# Automake
|
||||
AM_INIT_AUTOMAKE
|
||||
AM_PROG_CC_C_O
|
@ -1,31 +0,0 @@
|
||||
From 69baa8948f2d922554e815c572d8339a4a197306 Mon Sep 17 00:00:00 2001
|
||||
From: Ken Dreyer <ken.dreyer@inktank.com>
|
||||
Date: Tue, 7 Jan 2014 21:51:14 -0700
|
||||
Subject: [PATCH] Fedora only: fix sbin path
|
||||
|
||||
On Fedora, /sbin is a symbolic link to /usr/sbin. Install all the sbin
|
||||
binaries into the /usr/sbin location.
|
||||
|
||||
Signed-off-by: Ken Dreyer <ken.dreyer@inktank.com>
|
||||
---
|
||||
src/Makefile-env.am | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/Makefile-env.am b/src/Makefile-env.am
|
||||
index 9bc6ee7..d02f034 100644
|
||||
--- a/src/Makefile-env.am
|
||||
+++ b/src/Makefile-env.am
|
||||
@@ -26,8 +26,8 @@ bin_DEBUGPROGRAMS =
|
||||
# like sbin_SCRIPTS but can be used to install to e.g. /usr/sbin
|
||||
ceph_sbindir = $(sbindir)
|
||||
|
||||
-# certain things go straight into /sbin, though!
|
||||
-su_sbindir = /sbin
|
||||
+# On Fedora these things also go into /usr/sbin
|
||||
+su_sbindir = $(sbindir)
|
||||
|
||||
# C/C++ tests to build will be appended to this
|
||||
check_PROGRAMS =
|
||||
--
|
||||
1.8.3.1
|
||||
|
@ -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
|
Loading…
Reference in New Issue
Block a user