Compare commits

...

21 Commits

Author SHA1 Message Date
Boris Ranto 439eb70dcf Just bump the release... 2014-12-03 09:44:13 +01:00
Boris Ranto d8048b573b Sync-up with upstream -- formatting issues 2014-11-12 14:59:35 +01:00
Boris Ranto 7ebc469b21 Fix the removed path (missing RPM_BUILD_ROOT) 2014-11-03 17:38:23 +01:00
Boris Ranto 3b0b0e04e8 Rebase to latest major version (firefly -> giant) 2014-11-03 16:31:09 +01:00
Boris Ranto 290a036741 Rebase to latest upstream version 2014-10-16 12:38:49 +02:00
Boris Ranto a4d87e63c6 Fix the librados-devel vs librados2-devel problem 2014-10-11 15:58:58 +02:00
Boris Ranto 628a5cfe1f Provide empty file list for python-ceph-compat and ceph-devel-compat 2014-10-10 16:42:20 +02:00
Boris Ranto 7da3554afd Rebase and split ceph-devel, python-ceph packages 2014-10-10 15:44:05 +02:00
Dan Horák 34495d4d5f - update Requires for s390(x) 2014-09-09 10:12:07 +02:00
Boris Ranto 273aebea8d Fix bz 1136811 (incorrect symlink on fedora) 2014-09-03 15:30:38 +02:00
Boris Ranto ac3de9eccb Fix bogus dates 2014-08-22 01:56:50 +02:00
Boris Ranto e46d0f152b Second attempt to fix selinux issue (bz 1118504) 2014-08-22 01:53:25 +02:00
Boris Ranto b3185457ec Revert "Modify configure flags to get rid of selinux-related permission denied when loading libraries (bz 1118504)"
This reverts commit 7f6844291d.

The reason is that the commit did not fix the issue.
2014-08-22 01:14:20 +02:00
Boris Ranto 7f6844291d Modify configure flags to get rid of selinux-related permission denied when loading libraries (bz 1118504) 2014-08-21 17:42:17 +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
9 changed files with 889 additions and 342 deletions
-40
View File
@@ -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
-14
View File
@@ -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)])
-11
View File
@@ -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
-31
View File
@@ -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
+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"
-18
View File
@@ -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
+875 -214
View File
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -1 +1 @@
5020b63746ccbaa454aab09450ee7a43 ceph-0.81.tar.bz2
32159ac85d2c45862dab5b3ac901402c ceph-0.87.tar.bz2