[packages/ceph] - rel 2; fix build with new boost

arekm arekm at pld-linux.org
Fri Jun 19 08:17:20 CEST 2015


commit eab7d9fa7bb5b3a0dbd2e9098fe35a84a393f5f2
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Fri Jun 19 08:17:15 2015 +0200

    - rel 2; fix build with new boost

 ceph-boost.patch | 27 +++++++++++++++++++++++++++
 ceph.spec        |  4 +++-
 2 files changed, 30 insertions(+), 1 deletion(-)
---
diff --git a/ceph.spec b/ceph.spec
index e6d36fc..1c32965 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -22,7 +22,7 @@ Summary:	User space components of the Ceph file system
 Summary(pl.UTF-8):	Działające w przestrzeni użytkownika elementy systemu plików Ceph
 Name:		ceph
 Version:	0.94.2
-Release:	1
+Release:	2
 License:	LGPL v2.1 (libraries), GPL v2 (some programs)
 Group:		Base
 Source0:	http://ceph.com/download/%{name}-%{version}.tar.bz2
@@ -39,6 +39,7 @@ Patch0:		%{name}-init-fix.patch
 Patch1:		%{name}.logrotate.patch
 Patch2:		%{name}-link.patch
 Patch3:		%{name}-ac.patch
+Patch4:		%{name}-boost.patch
 URL:		http://ceph.com/
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake
@@ -213,6 +214,7 @@ Agenci OCF do monitorowania procesów Cepha.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 %{__libtoolize}
diff --git a/ceph-boost.patch b/ceph-boost.patch
new file mode 100644
index 0000000..11a1d55
--- /dev/null
+++ b/ceph-boost.patch
@@ -0,0 +1,27 @@
+From e7b196a4a091c0ea258866559ba06e7ed0cc4247 Mon Sep 17 00:00:00 2001
+From: Kefu Chai <kchai at redhat.com>
+Date: Fri, 8 May 2015 15:21:20 +0800
+Subject: [PATCH] mon: remove unused variable
+
+* as a side effect, this change silences
+  http://tracker.ceph.com/issues/11576
+
+Fixes: #11576
+Signed-off-by: Kefu Chai <kchai at redhat.com>
+---
+ src/mon/OSDMonitor.cc | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
+index 73dcd5f..7caaa45 100644
+--- a/src/mon/OSDMonitor.cc
++++ b/src/mon/OSDMonitor.cc
+@@ -3174,8 +3174,6 @@ bool OSDMonitor::preprocess_command(MMonCommand *m)
+   } else if (prefix == "osd crush get-tunable") {
+     string tunable;
+     cmd_getval(g_ceph_context, cmdmap, "tunable", tunable);
+-    int value;
+-    cmd_getval(g_ceph_context, cmdmap, "value", value);
+     ostringstream rss;
+     if (f)
+       f->open_object_section("tunable");
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ceph.git/commitdiff/eab7d9fa7bb5b3a0dbd2e9098fe35a84a393f5f2



More information about the pld-cvs-commit mailing list