Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Dan Horák
|
0a05e8b2a2 | ||
|
Josef Bacik
|
4707fdaea8 |
+10
-2
@@ -1,2 +1,10 @@
|
||||
ceph-*.tar.*
|
||||
*.src.rpm
|
||||
ceph-0.20.tar.gz
|
||||
/ceph-0.21.3.tar.gz
|
||||
/ceph-0.25.1.tar.gz
|
||||
/ceph-0.26.tar.gz
|
||||
/ceph-0.31.tar.gz
|
||||
/ceph-0.37.tar.gz
|
||||
/ceph-0.39.tar.gz
|
||||
/ceph-0.43.tar.bz2
|
||||
/ceph-0.44.tar.bz2
|
||||
/ceph-0.45.tar.bz2
|
||||
|
||||
@@ -0,0 +1,52 @@
|
||||
From d3bcac241f25f681a585c2115a79befe43dd7d6c Mon Sep 17 00:00:00 2001
|
||||
From: Jim Schutt <jaschut@sandia.gov>
|
||||
Date: Wed, 21 Mar 2012 10:09:09 -0600
|
||||
Subject: [PATCH] Makefile: fix modules that cannot find pk11pub.h when
|
||||
compiling with NSS on RHEL6
|
||||
|
||||
Signed-off-by: Jim Schutt <jaschut@sandia.gov>
|
||||
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
|
||||
---
|
||||
src/Makefile.am | 5 ++++-
|
||||
1 files changed, 4 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/src/Makefile.am b/src/Makefile.am
|
||||
index a6e6a95..80802bc 100644
|
||||
--- a/src/Makefile.am
|
||||
+++ b/src/Makefile.am
|
||||
@@ -48,7 +48,7 @@ if LINUX
|
||||
ceph_osd_LDADD += -ldl
|
||||
endif
|
||||
bin_PROGRAMS += ceph-osd
|
||||
-ceph_osd_CXXFLAGS = ${AM_CXXFLAGS} \
|
||||
+ceph_osd_CXXFLAGS = ${CRYPTO_CXXFLAGS} ${AM_CXXFLAGS} \
|
||||
-I$(top_srcdir)/src/leveldb/include
|
||||
|
||||
# mds
|
||||
@@ -111,6 +111,7 @@ osdmaptool_LDADD = $(LIBGLOBAL_LDA)
|
||||
bin_PROGRAMS += monmaptool crushtool osdmaptool
|
||||
|
||||
ceph_dencoder_SOURCES = test/encoding/ceph_dencoder.cc
|
||||
+ceph_dencoder_CXXFLAGS = ${CRYPTO_CXXFLAGS} ${AM_CXXFLAGS}
|
||||
ceph_dencoder_LDADD = $(LIBGLOBAL_LDA) libosd.la libmds.a libos.la libmon.la
|
||||
bin_PROGRAMS += ceph-dencoder
|
||||
|
||||
@@ -1002,6 +1003,7 @@ libmon_la_SOURCES = \
|
||||
mon/AuthMonitor.cc \
|
||||
mon/Elector.cc \
|
||||
mon/MonitorStore.cc
|
||||
+libmon_la_CXXFLAGS= ${CRYPTO_CXXFLAGS} ${AM_CXXFLAGS}
|
||||
libmon_la_LIBADD = libglobal.la
|
||||
noinst_LTLIBRARIES += libmon.la
|
||||
|
||||
@@ -1070,6 +1072,7 @@ libosdc_la_SOURCES = \
|
||||
osdc/ObjectCacher.cc \
|
||||
osdc/Filer.cc \
|
||||
osdc/Journaler.cc
|
||||
+libosdc_la_CXXFLAGS= ${CRYPTO_CXXFLAGS} ${AM_CXXFLAGS}
|
||||
libosdc_la_LIBADD = libcommon.la
|
||||
noinst_LTLIBRARIES += libosdc.la
|
||||
|
||||
--
|
||||
1.7.7.6
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
--- ceph-0.80.5/src/perfglue/heap_profiler.cc.orig 2014-08-15 16:05:00.161794290 +0200
|
||||
+++ ceph-0.80.5/src/perfglue/heap_profiler.cc 2014-08-15 16:05:04.691794305 +0200
|
||||
@@ -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"
|
||||
@@ -0,0 +1,51 @@
|
||||
diff -up ceph-0.45/src/leveldb/configure.ac.atomic ceph-0.45/src/leveldb/configure.ac
|
||||
--- ceph-0.45/src/leveldb/configure.ac.atomic 2012-04-23 18:56:15.000000000 +0200
|
||||
+++ ceph-0.45/src/leveldb/configure.ac 2012-04-23 19:33:27.000000000 +0200
|
||||
@@ -10,11 +10,11 @@ AC_CONFIG_FILES([
|
||||
])
|
||||
AC_PROG_RANLIB
|
||||
|
||||
-AC_MSG_CHECKING(whether compiler supports C++11 cstdatomic)
|
||||
+AC_MSG_CHECKING(whether compiler supports C++11 atomic)
|
||||
OLD_CXXFLAGS="$CXXFLAGS"
|
||||
CXXFLAGS="$CXXFLAGS -std=c++0x"
|
||||
AC_COMPILE_IFELSE([AC_LANG_SOURCE([
|
||||
-#include <cstdatomic>
|
||||
+#include <atomic>
|
||||
int main() {}
|
||||
])], [
|
||||
AC_MSG_RESULT(yes)
|
||||
diff -up ceph-0.45/src/leveldb/configure.atomic ceph-0.45/src/leveldb/configure
|
||||
--- ceph-0.45/src/leveldb/configure.atomic 2012-04-23 18:56:19.000000000 +0200
|
||||
+++ ceph-0.45/src/leveldb/configure 2012-04-23 18:56:43.000000000 +0200
|
||||
@@ -3885,15 +3885,15 @@ else
|
||||
fi
|
||||
|
||||
|
||||
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiler supports C++11 cstdatomic" >&5
|
||||
-$as_echo_n "checking whether compiler supports C++11 cstdatomic... " >&6; }
|
||||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiler supports C++11 atomic" >&5
|
||||
+$as_echo_n "checking whether compiler supports C++11 atomic... " >&6; }
|
||||
OLD_CXXFLAGS="$CXXFLAGS"
|
||||
CXXFLAGS="$CXXFLAGS -std=c++0x"
|
||||
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
-#include <cstdatomic>
|
||||
+#include <atomic>
|
||||
int main() {}
|
||||
|
||||
_ACEOF
|
||||
diff -up ceph-0.45/src/leveldb/port/atomic_pointer.h.atomic ceph-0.45/src/leveldb/port/atomic_pointer.h
|
||||
--- ceph-0.45/src/leveldb/port/atomic_pointer.h.atomic 2012-04-23 18:56:54.000000000 +0200
|
||||
+++ ceph-0.45/src/leveldb/port/atomic_pointer.h 2012-04-23 18:57:00.000000000 +0200
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
#include <stdint.h>
|
||||
#ifdef LEVELDB_CSTDATOMIC_PRESENT
|
||||
-#include <cstdatomic>
|
||||
+#include <atomic>
|
||||
#endif
|
||||
#ifdef OS_WIN
|
||||
#include <windows.h>
|
||||
@@ -0,0 +1,18 @@
|
||||
diff -up ceph-0.41/src/init-ceph.in.init ceph-0.41/src/init-ceph.in
|
||||
--- ceph-0.41/src/init-ceph.in.init 2012-01-17 15:33:20.000000000 -0500
|
||||
+++ ceph-0.41/src/init-ceph.in 2012-02-16 12:48:50.887279921 -0500
|
||||
@@ -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 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
|
||||
@@ -1,11 +0,0 @@
|
||||
--- ceph-0.80.5/src/test/Makefile.am.orig 2014-08-15 16:30:18.831799418 +0200
|
||||
+++ ceph-0.80.5/src/test/Makefile.am 2014-08-15 16:23:17.758464663 +0200
|
||||
@@ -642,7 +642,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,40 +0,0 @@
|
||||
From 369daeeb447154016f774d16f1b618cdaaf575d5 Mon Sep 17 00:00:00 2001
|
||||
From: Boris Ranto <branto@redhat.com>
|
||||
Date: Fri, 31 Oct 2014 03:27:46 +0100
|
||||
Subject: [PATCH] Remove systemd detection in ceph init script, rhbz#1157938
|
||||
|
||||
---
|
||||
src/init-ceph.in | 10 +---------
|
||||
1 file changed, 1 insertion(+), 9 deletions(-)
|
||||
|
||||
diff --git a/src/init-ceph.in b/src/init-ceph.in
|
||||
index 95723b0..1effb56 100644
|
||||
--- a/src/init-ceph.in
|
||||
+++ b/src/init-ceph.in
|
||||
@@ -44,10 +44,6 @@ test -f $LIBDIR/ceph_common.sh || exit 0
|
||||
|
||||
EXIT_STATUS=0
|
||||
|
||||
-# detect systemd
|
||||
-SYSTEMD=0
|
||||
-grep -qs systemd /proc/1/comm && SYSTEMD=1
|
||||
-
|
||||
signal_daemon() {
|
||||
name=$1
|
||||
daemon=$2
|
||||
@@ -276,11 +272,7 @@ for name in $what; do
|
||||
[ -n "$wrap" ] && runmode="-f &" && runarg="-f"
|
||||
[ -n "$max_open_files" ] && files="ulimit -n $max_open_files;"
|
||||
|
||||
- if [ $SYSTEMD -eq 1 ]; then
|
||||
- cmd="systemd-run -r bash -c '$files $cmd --cluster $cluster -f'"
|
||||
- else
|
||||
- cmd="$files $wrap $cmd --cluster $cluster $runmode"
|
||||
- fi
|
||||
+ cmd="$files $wrap $cmd --cluster $cluster $runmode"
|
||||
|
||||
if [ $dofsmount -eq 1 ] && [ -n "$fs_devs" ]; then
|
||||
get_conf pre_mount "true" "pre mount command"
|
||||
--
|
||||
1.9.3
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
--- ./src/logrotate.conf.new 2012-01-11 18:23:10.597593501 -0500
|
||||
+++ ./src/logrotate.conf 2012-01-11 18:23:26.808390838 -0500
|
||||
@@ -4,7 +4,7 @@
|
||||
compress
|
||||
sharedscripts
|
||||
postrotate
|
||||
- invoke-rc.d ceph reload >/dev/null || service ceph reload >/dev/null
|
||||
+ service ceph reload >/dev/null 2>/dev/null || true
|
||||
endscript
|
||||
missingok
|
||||
}
|
||||
Reference in New Issue
Block a user