Package: ceph
Followup-For: Bug #795178
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu wily ubuntu-patch
Dear Maintainer,
Please consider this updated patch, which now includes dep3 data.
*** /tmp/tmpQjuvXN/bug_body
In Ubuntu, the attached patch was applied to achieve the following:
- Allow build with boost 1.58.
* Non-maintainer upload.
* Fix compile failure with boost 1.58 (LP: #1483403, closes 795178):
- src/mon/OSDMonitor.cc: backport Ceph#11576 remove unused variable
Thanks for considering the patch.
-- System Information:
Debian Release: jessie/sid
APT prefers vivid-updates
APT policy: (500, 'vivid-updates'), (500, 'vivid-security'), (500, 'vivid'),
(100, 'vivid-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.19.0-26-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru ceph-0.94.2/debian/changelog ceph-0.94.2/debian/changelog
diff -Nru ceph-0.94.2/debian/patches/remove-unused-variable-ceph-bug-11576.patch ceph-0.94.2/debian/patches/remove-unused-variable-ceph-bug-11576.patch
--- ceph-0.94.2/debian/patches/remove-unused-variable-ceph-bug-11576.patch 1969-12-31 21:00:00.000000000 -0300
+++ ceph-0.94.2/debian/patches/remove-unused-variable-ceph-bug-11576.patch 2015-08-31 09:13:06.000000000 -0300
@@ -0,0 +1,25 @@
+Description: ceph fails to compile with boost 1.58
+ see http://www.boost.org/doc/libs/1_58_0/doc/html/boost/relaxed_get.html
+ and http://www.boost.org/doc/libs/1_58_0/doc/html/boost/get_idp295310448.html,
+ boost 1.58 introduced "strict_get" and boost::get is an alias of it. but we
+ are using boost::get<int>(tuple<int64, ...>)
+Author: Kefu Chai <tchai...@gmail.com>
+Origin: upstream, https://github.com/ceph/ceph/pull/4616
+Bug: http://tracker.ceph.com/issues/11576
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=795178
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/ceph/+bug/1483403
+Applied-Upstream: 0.94.3, http://tracker.ceph.com/issues/11982
+Last-Update: 2015-08-11
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/mon/OSDMonitor.cc
++++ b/src/mon/OSDMonitor.cc
+@@ -2998,8 +2998,6 @@
+ } 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");
diff -Nru ceph-0.94.2/debian/patches/series ceph-0.94.2/debian/patches/series
--- ceph-0.94.2/debian/patches/series 2015-07-09 07:36:07.000000000 -0300
+++ ceph-0.94.2/debian/patches/series 2015-08-31 09:02:24.000000000 -0300
@@ -18,3 +18,4 @@
fix-argparse-defaults.patch
fix-cycles-arch.patch
vivid-does-systemd.patch
+remove-unused-variable-ceph-bug-11576.patch
