Compare commits

...

72 Commits

Author SHA1 Message Date
Boris Ranto de8bfba2ef Do not use systemd-run in Fedora 19
Resolves: rhbz#1157938
2014-10-31 03:35:39 +01:00
Dan Horák f71517fa89 - update Requires for s390(x) 2014-09-09 10:16:00 +02:00
Boris Ranto d84f5c5288 Fix bz 1136811 (incorrect symlink on fedora) 2014-09-03 15:37:30 +02:00
Boris Ranto 8d46a4a552 Second attempt to fix selinux issue (bz 1118504) 2014-08-22 02:04:35 +02:00
Kalev Lember 25b47f32a9 Obsolete ceph-libcephfs
Correct the name of the obsoleted package. It used to be called
"ceph-libcephfs" and not "libcephfs".

Transaction check error:
file /usr/lib64/libcephfs.so.1.0.0 from install of
libcephfs1-1:0.80.5-5.fc21.x86_64 conflicts with file from package
ceph-libcephfs-0.81.0-6.fc21.x86_64
2014-08-16 23:38:39 +02:00
Boris Ranto e44806fede Various fixes:
- Do not require xfsprogs/xfsprogs-devel for el6
- Require gperftools-devel for non-ppc*/s390* architectures only
- Do not require junit -- no need to build libcephfs-test.jar
- Build without libxfs for el6
- Build without tcmalloc for ppc*/s390* architectures
- Location of mkcephfs must depend on a rhel release
- Use epoch in the Requires fields [1130700]
2014-08-16 16:00:20 +02:00
Boris Ranto 830e99f484 Use the proper version name in Obsoletes, the previous one did not obsolete all the packages that it should 2014-08-16 10:32:16 +02:00
Boris Ranto a236dbbbe2 Fix the date in changelog 2014-08-16 03:50:05 +02:00
Peter Robinson c81d313d7c - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild 2014-08-15 23:54:45 +00:00
Boris Ranto 5311ad2942 Add the arm pthread hack 2014-08-16 01:11:30 +02:00
Boris Ranto 08b7207d61 Bump the Epoch, we need to keep the latest stable, not development, ceph version in fedora
- Use the upstream spec file with the ceph-libs split
- Add libs-compat subpackage
- Use fedora in rhel 7 checks
- Obsolete libcephfs
- Depend on redhat-lsb-core for the initscript
2014-08-15 23:07:34 +02:00
Kalev Lember d1845800ed Add obsoletes to keep the upgrade path working
https://bugzilla.redhat.com/show_bug.cgi?id=1118510
2014-08-13 20:27:19 +02:00
Kaleb S. KEITHLEY 9a1331d776 revert to old spec until after f21 branch 2014-07-07 08:13:40 -04:00
Kaleb S. KEITHLEY ed8d9af197 temporary exclude f21/armv7hl. N.B. it builds fine on f20/armv7hl. 2014-07-04 15:36:03 -04:00
Kaleb S. KEITHLEY 4be65c200b upstream ceph.spec file 2014-07-04 12:45:53 -04:00
Kaleb S. KEITHLEY 57cc7e9923 upstream ceph.spec file 2014-07-01 14:19:27 -04:00
Kaleb S. KEITHLEY 10fcd5ea45 upstream ceph.spec file 2014-07-01 13:47:44 -04:00
Dennis Gilmore e605c9c549 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild 2014-06-06 23:26:10 -05:00
Kaleb S. KEITHLEY 560f971731 el6 ppc64 likewise for tcmalloc, merge from origin/el6 2014-06-05 04:44:32 -04:00
Kaleb S. KEITHLEY cca983bdeb el6 ppc64 does not have gperftools, merge from origin/el6 2014-06-05 02:52:02 -04:00
Kaleb S. KEITHLEY 6c2f2c4e79 ceph-0.81.0 2014-06-05 02:17:45 -04:00
Peter Robinson 9c82455d7f gperftools now available on aarch64/ppc64 2014-06-04 14:02:57 +01:00
Petr Machata e579d551c9 Rebuild for boost 1.55.0 2014-05-23 12:31:44 +02:00
David Tardon aac817e15f rebuild for boost 1.55.0 2014-05-23 10:30:03 +02:00
Kaleb S. KEITHLEY c28233e26b build epel-6
- exclude %{_libdir}/ceph/erasure-code in base package
2014-05-14 10:52:10 -04:00
Kaleb S. KEITHLEY f082c040b2 Update to latest stable upstream release, BZ 1095201
- PIE, _hardened_build, BZ 955174
2014-05-13 16:00:51 -04:00
Ken Dreyer 4c912aebbb Move plugins from -devel into -libs package (#891993)
Thanks Michael Schwendt <mschwendt@gmail.com>.
2014-02-05 22:04:44 -07:00
Ken Dreyer b4b867b0c4 remove trailing whitespace 2014-01-29 15:10:47 -07:00
Ken Dreyer f07f612bc9 Merge branch 'master' into epel7 2014-01-29 15:10:09 -07:00
Ken Dreyer c523b37b4d Update to latest stable upstream release
- Use HTTPS for URLs
- Submit Automake 1.12 patch upstream
- Move unversioned shared libs from ceph-libs into ceph-devel
2014-01-13 09:45:08 -07:00
Peter Robinson a69f0258b3 build without tcmalloc on aarch64 (no gperftools) 2013-12-18 10:44:46 +00:00
Peter Robinson 975579a765 gperftools not currently available on aarch64 2013-11-30 17:30:20 +00:00
Dan Horák 8ee25c7ded Merge branch 'master' into f19 2013-10-07 12:09:49 +02:00
Dan Horák 52a2b9bf64 - fix build on non-x86_64 64-bit arches 2013-10-07 12:08:23 +02:00
Josef Bacik 77906caf26 - fix a sample.conf problem 2013-09-13 09:40:03 -04:00
Josef Bacik e11916a191 Merge branch 'master' into f19
Conflicts:
	ceph.spec
2013-09-11 16:12:42 -04:00
Josef Bacik 7d8598d9d5 - update to 0.67.3 2013-09-11 16:09:38 -04:00
Michael Schwendt f6f6a625d7 General cleanup for Duplicate Provides, but found lots of other issues
in the spec file:
- let base package include all its documentation files via %doc magic,
  so for Fedora 20 Unversioned Docdirs no files are included accidentally
- include the sample config files again (instead of just an empty docdir
  that has been added for #846735)
- don't include librbd.so.1 also in -devel package (#1003202)
- move one misplaced rados plugin from -devel into -libs package (#891993)
- include missing directories in -devel and -libs packages
- move librados-config into the -devel pkg where its manual page is, too
- add %_isa to subpackage dependencies
- don't use %defattr anymore
- add V=1 to make invocation for verbose build output
2013-09-11 14:15:50 +02:00
Peter Robinson 522d4bf6a9 re-enable tmalloc on arm now gperftools is fixed 2013-07-31 18:29:23 +01:00
Peter Robinson fc25307343 re-enable tmalloc on arm now gperftools is fixed 2013-07-31 17:03:16 +01:00
Josef Bacik 20d29cd716 - fix the sample.conf name 2013-07-30 11:21:03 -04:00
Josef Bacik b0e4352954 - apparently older versions of rpm need me to specify the files under the dir 2013-07-30 10:50:03 -04:00
Josef Bacik 9cd0433a2c - disable tmalloc on arm 2013-07-29 15:13:54 -04:00
Josef Bacik c0e66ef34e - update .gitignore and sources 2013-07-29 15:02:12 -04:00
Josef Bacik 7d1f840a1f - update to 0.61.7 2013-07-29 14:59:31 -04:00
Petr Machata 6bb58e5016 Rebuild for boost 1.54.0 2013-07-27 14:52:09 +02:00
Josef Bacik 15e2e4694f - actually add new patch 2013-03-29 16:45:14 -04:00
Josef Bacik 514a2a17d7 - Update to 0.56.4 2013-03-29 16:39:26 -04:00
Josef Bacik 5b135f1378 Merge branch 'master' into f18
Conflicts:
	ceph.spec
2013-02-21 16:41:35 -05:00
Josef Bacik 3991b7a14d - update to 0.56.3 2013-02-21 16:37:30 -05:00
Richard W.M. Jones ffa978b691 Rebuilt to try to fix boost dependency problem in Rawhide. 2013-02-11 20:51:34 +00:00
Josef Bacik f5c462a933 - updated to 0.53 2012-11-01 11:18:39 -04:00
Jonathan Dieter 0521dc9b41 Rebuild after buildroot was messed up
Signed-off-by: Jonathan Dieter <jdieter@lesbg.com>
2012-09-24 15:39:26 +03:00
Jonathan Dieter 9855df9139 Fix automake 1.12 error
Signed-off-by: Jonathan Dieter <jdieter@lesbg.com>
2012-09-24 09:22:21 +03:00
Jonathan Dieter ff794c7017 Use system leveldb instead of bundled library
Signed-off-by: Jonathan Dieter <jdieter@lesbg.com>
2012-09-24 09:00:37 +03:00
David Nalley 6449f95424 updating to 0.51 2012-09-09 13:41:08 -04:00
Dennis Gilmore 19726c103f - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild 2012-07-18 13:47:55 -05:00
Josef Bacik d02143ac96 -fix some missing man pages and such 2012-05-10 09:56:19 -04:00
Josef Bacik 8f23225f59 - update to 0.46 2012-05-09 17:00:02 -04:00
Dan Horák ba92463cc7 fix detection of C++11 atomic header 2012-04-23 20:05:49 +02:00
Josef Bacik 50e073a68a - update to upstream 0.45 2012-04-12 16:02:46 -04:00
Peter Robinson 563583e5c0 fix building on ARM 2012-04-04 20:49:36 +01:00
Dan Horák 6eb8fdf3f0 gperftools not available also on ppc 2012-03-26 11:32:43 +02:00
Jonathan Dieter 0f5f195c33 Update to 0.44
Signed-off-by: Jonathan Dieter <jdieter@lesbg.com>
2012-03-26 10:39:06 +03:00
Jonathan Dieter b003ada4bc Merge branch 'f17'
Signed-off-by: Jonathan Dieter <jdieter@lesbg.com>
2012-03-06 17:10:38 +02:00
Jonathan Dieter f32a9e4df7 Update to upstream 0.43 and drop unnecessary patches
Signed-off-by: Jonathan Dieter <jdieter@lesbg.com>
2012-03-06 16:58:21 +02:00
Dennis Gilmore 3cf1ae6df2 - Rebuilt for c++ ABI breakage 2012-02-28 12:01:56 -06:00
Tom Callaway dc8a12beda update to 0.41, fix ftbfs, rebuild against gperftools 2012-02-16 21:39:09 -05:00
Tom Callaway 9097f5d573 0.41 + build fixes 2012-02-16 21:21:05 -05:00
David Nalley c0a0a52a8b fixing bug 773194 and upgrading to 0.39 in the process 2012-01-13 14:06:41 -05:00
Dennis Gilmore ca214a19e5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild 2012-01-12 17:12:05 -06:00
Michael Schwendt 11db7b3461 fix -static BuildRequires 2011-11-17 19:37:24 +01:00
8 changed files with 934 additions and 171 deletions
+2 -6
View File
@@ -1,6 +1,2 @@
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-*.tar.*
*.src.rpm
+13
View File
@@ -0,0 +1,13 @@
--- 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"
-17
View File
@@ -1,17 +0,0 @@
--- 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
-# 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
+11
View File
@@ -0,0 +1,11 @@
--- 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
+40
View File
@@ -0,0 +1,40 @@
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
-14
View File
@@ -1,14 +0,0 @@
--- src/logrotate.conf 2011-07-30 16:50:50.000000000 -0400
+++ src/logrotate.conf.new 2011-11-05 17:41:02.567151275 -0400
@@ -1,9 +1,10 @@
/var/log/ceph/*.log {
rotate 7
daily
+ missingok
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
}
+867 -133
View File
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -1 +1 @@
b97598058588907982c6e8df465ffa1a ceph-0.37.tar.gz
c57f6887f6097f95ad2c3b169a94f811 ceph-0.80.5.tar.bz2