Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Tom Callaway
|
79ba39cd11 | ||
|
David Nalley
|
f6bd21aaa2 | ||
|
David Nalley
|
07057e050a | ||
|
David Nalley
|
18879ad313 | ||
|
Josef Bacik
|
0e4cc7c1b7 | ||
|
Josef Bacik
|
8cb6eae323 |
@@ -5,6 +5,3 @@ ceph-0.20.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
|
||||
|
||||
@@ -1,52 +0,0 @@
|
||||
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,51 +0,0 @@
|
||||
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>
|
||||
+5
-6
@@ -1,6 +1,5 @@
|
||||
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
|
||||
--- ceph-0.21.1/src/init-ceph.in.orig 2010-07-29 15:16:49.000000000 -0500
|
||||
+++ ceph-0.21.1/src/init-ceph.in 2010-08-26 14:58:25.328581937 -0500
|
||||
@@ -1,11 +1,11 @@
|
||||
#!/bin/sh
|
||||
# Start/stop ceph daemons
|
||||
@@ -9,10 +8,10 @@ diff -up ceph-0.41/src/init-ceph.in.init ceph-0.41/src/init-ceph.in
|
||||
|
||||
### BEGIN INIT INFO
|
||||
# Provides: ceph
|
||||
-# Default-Start: 2 3 5
|
||||
-# Default-Start: 2 3 4 5
|
||||
-# Default-Stop: 0 1 6
|
||||
+# Default-Start:
|
||||
+# Default-Stop:
|
||||
+# 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,27 +1,24 @@
|
||||
Name: ceph
|
||||
Version: 0.45
|
||||
Version: 0.39
|
||||
Release: 2%{?dist}
|
||||
Summary: User space components of the Ceph file system
|
||||
License: LGPLv2
|
||||
Group: System Environment/Base
|
||||
URL: http://ceph.newdream.net/
|
||||
|
||||
Source: http://ceph.newdream.net/download/%{name}-%{version}.tar.bz2
|
||||
Source: http://ceph.newdream.net/download/%{name}-%{version}.tar.gz
|
||||
Patch0: ceph-init-fix.patch
|
||||
Patch1: ceph.logrotate.patch
|
||||
# http://tracker.newdream.net/issues/2329
|
||||
Patch2: ceph-gxx-atomic.patch
|
||||
|
||||
BuildRequires: fuse-devel, libtool, libtool-ltdl-devel, boost-devel,
|
||||
BuildRequires: libedit-devel, fuse-devel, git, perl, gdbm, libaio-devel,
|
||||
BuildRequires: libedit-devel, fuse-devel, git, perl, gdbm,
|
||||
# google-perftools is not available on these:
|
||||
%ifnarch ppc ppc64 s390 s390x
|
||||
%ifnarch ppc64 s390 s390x
|
||||
BuildRequires: gperftools-devel
|
||||
%endif
|
||||
BuildRequires: cryptopp-devel, libatomic_ops-devel, gcc-c++
|
||||
BuildRequires: pkgconfig, libcurl-devel, keyutils-libs-devel
|
||||
BuildRequires: gtkmm24-devel, gtk2-devel, libuuid, libuuid-devel
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
Requires(post): chkconfig, binutils, libedit
|
||||
Requires(preun): chkconfig
|
||||
Requires(preun): initscripts
|
||||
@@ -82,34 +79,20 @@ file system.
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1 -b .init
|
||||
%patch1 -p0
|
||||
%patch2 -p1 -b .atomic
|
||||
%patch1 -p0
|
||||
|
||||
%build
|
||||
./autogen.sh
|
||||
|
||||
%ifarch armv5tel
|
||||
# libatomic_ops does not have correct asm for ARMv5tel
|
||||
EXTRA_CFLAGS="-DAO_USE_PTHREAD_DEFS"
|
||||
%endif
|
||||
%ifarch %{arm}
|
||||
# libatomic_ops seems to fallback on some pthread implementation on ARM
|
||||
EXTRA_LDFLAGS="-lpthread"
|
||||
%endif
|
||||
|
||||
%{configure} --prefix=/usr --sbindir=/sbin \
|
||||
--localstatedir=/var --sysconfdir=/etc \
|
||||
%ifarch ppc ppc64 s390 s390x
|
||||
%ifarch ppc64 s390 s390x
|
||||
--without-tcmalloc \
|
||||
%endif
|
||||
--without-hadoop --with-radosgw --with-gtk2 \
|
||||
CFLAGS="$RPM_OPT_FLAGS $EXTRA_CFLAGS" \
|
||||
CXXFLAGS="$RPM_OPT_FLAGS $EXTRA_CFLAGS" \
|
||||
LDFLAGS="$EXTRA_LDFLAGS"
|
||||
|
||||
make %{?_smp_mflags}
|
||||
--without-hadoop --with-radosgw --with-gtk2
|
||||
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS"
|
||||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
make install DESTDIR=$RPM_BUILD_ROOT
|
||||
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
|
||||
find $RPM_BUILD_ROOT -type f -name "*.a" -exec rm -f {} ';'
|
||||
@@ -121,6 +104,8 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/ceph/
|
||||
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/ceph/stat
|
||||
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ceph
|
||||
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%post
|
||||
/sbin/ldconfig
|
||||
@@ -161,7 +146,6 @@ fi
|
||||
%{_bindir}/rbd
|
||||
%{_bindir}/ceph-debugpack
|
||||
%{_bindir}/ceph-coverage
|
||||
%{_bindir}/ceph-dencoder
|
||||
%{_initrddir}/ceph
|
||||
%{_libdir}/libcephfs.so.*
|
||||
%{_libdir}/librados.so.*
|
||||
@@ -197,8 +181,7 @@ fi
|
||||
%{_mandir}/man8/rbd.8*
|
||||
%{_mandir}/man8/ceph-authtool.8*
|
||||
%{_mandir}/man8/ceph-debugpack.8*
|
||||
%{_mandir}/man8/ceph-clsinfo.8*
|
||||
%{_mandir}/man8/ceph-dencoder.8*
|
||||
%{_mandir}/man8/ceph-clsinfo.8.gz
|
||||
%{python_sitelib}/rados.py*
|
||||
%{python_sitelib}/rgw.py*
|
||||
%{python_sitelib}/rbd.py*
|
||||
@@ -252,37 +235,7 @@ fi
|
||||
%{_bindir}/boto_tool
|
||||
|
||||
%changelog
|
||||
* Mon Apr 23 2012 Dan Horák <dan[at]danny.cz> - 0.45-2
|
||||
- fix detection of C++11 atomic header
|
||||
|
||||
* Thu Apr 12 2012 Josef Bacik <josef@toxicpanda.com> - 0.45-1
|
||||
- updating to upstream 0.45
|
||||
|
||||
* Wed Apr 4 2012 Niels de Vos <devos@fedoraproject.org> - 0.44-5
|
||||
- Add LDFLAGS=-lpthread on any ARM architecture
|
||||
- Add CFLAGS=-DAO_USE_PTHREAD_DEFS on ARMv5tel
|
||||
|
||||
* Mon Mar 26 2012 Dan Horák <dan[at]danny.cz> 0.44-4
|
||||
- gperftools not available also on ppc
|
||||
|
||||
* Mon Mar 26 2012 Jonathan Dieter <jdieter@lesbg.com> - 0.44-3
|
||||
- Remove unneeded patch
|
||||
|
||||
* Sun Mar 25 2012 Jonathan Dieter <jdieter@lesbg.com> - 0.44-2
|
||||
- Update to 0.44
|
||||
- Fix build problems
|
||||
|
||||
* Mon Mar 5 2012 Jonathan Dieter <jdieter@lesbg.com> - 0.43-1
|
||||
- Update to 0.43
|
||||
- Remove upstreamed compile fixes patch
|
||||
- Remove obsoleted dump_pop patch
|
||||
|
||||
* Tue Feb 28 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.41-2
|
||||
- Rebuilt for c++ ABI breakage
|
||||
|
||||
* Thu Feb 16 2012 Tom Callaway <spot@fedoraproject.org> 0.41-1
|
||||
- update to 0.41
|
||||
- fix issues preventing build
|
||||
* Thu Feb 16 2012 Tom Callaway <spot@fedoraproject.org> 0.39-2
|
||||
- rebuild against gperftools
|
||||
|
||||
* Sat Dec 03 2011 David Nalley <david@gnsa.us> 0.38-1
|
||||
|
||||
Reference in New Issue
Block a user