[Pkg-ceph-commits] [ceph] 17/59: Support build on armhf

[James Downing Page]

This is an automated email from the git hooks/post-receive script.

jamespage pushed a commit to branch ubuntu/artful
in repository ceph.

commit 7c7a5be3265321afde23ba38410b4aa75e559b39
Author: James Page <james.page at ubuntu.com>
Date:   Fri Jun 16 12:28:01 2017 +0000

    Support build on armhf
    
    - d/p/TestMockImageReplayer-cleanup.patch: Cherry pick cleanup work
      to avoid link failure due to direct inclusion of .cc files.
---
 debian/changelog                                   |  3 ++
 debian/patches/TestMockImageReplayer-cleanup.patch | 48 ++++++++++++++++++++++
 debian/patches/series                              |  3 ++
 3 files changed, 54 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 8547678..0afe1ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -40,6 +40,9 @@ ceph (12.0.3-0ubuntu1) UNRELEASED; urgency=medium
       to resolve compatibility with gcc-6 on i386.
     - d/p/rgw-migrate-atomic_t-to-std_atomic.patch: Cherry pick fix
       for 32 bit casting issues in RGW.
+  * Support build on armhf:
+    - d/p/TestMockImageReplayer-cleanup.patch: Cherry pick cleanup work
+      to avoid link failure due to direct inclusion of .cc files.
 
  -- James Page <james.page at ubuntu.com>  Fri, 26 May 2017 09:42:42 +0000
 
diff --git a/debian/patches/TestMockImageReplayer-cleanup.patch b/debian/patches/TestMockImageReplayer-cleanup.patch
new file mode 100644
index 0000000..6cf404e
--- /dev/null
+++ b/debian/patches/TestMockImageReplayer-cleanup.patch
@@ -0,0 +1,48 @@
+From b07426092222cecb4e7b87363b132e7332e79cc6 Mon Sep 17 00:00:00 2001
+From: Mykola Golub <mgolub at mirantis.com>
+Date: Sat, 22 Apr 2017 12:26:16 +0200
+Subject: [PATCH] test/rbd_mirror: TestMockImageReplayer cleanup
+
+Remove unnecessary ImageSyncThrottler dependency.
+
+Signed-off-by: Mykola Golub <mgolub at mirantis.com>
+---
+ src/test/rbd_mirror/test_mock_ImageReplayer.cc | 18 +-----------------
+ 1 file changed, 1 insertion(+), 17 deletions(-)
+
+diff --git a/src/test/rbd_mirror/test_mock_ImageReplayer.cc b/src/test/rbd_mirror/test_mock_ImageReplayer.cc
+index c845faacaf54..ce153a565bbd 100644
+--- a/src/test/rbd_mirror/test_mock_ImageReplayer.cc
++++ b/src/test/rbd_mirror/test_mock_ImageReplayer.cc
+@@ -61,22 +61,7 @@ namespace rbd {
+ namespace mirror {
+ 
+ template<>
+-class ImageSync<librbd::MockTestImageCtx> {
+-public:
+-  static ImageSync* create(librbd::MockTestImageCtx *local_image_ctx,
+-                           librbd::MockTestImageCtx *remote_image_ctx,
+-                           SafeTimer *timer, Mutex *timer_lock,
+-                           const std::string &mirror_uuid,
+-                           journal::MockJournaler *journaler,
+-                           librbd::journal::MirrorPeerClientMeta *client_meta,
+-                           ContextWQ *work_queue, Context *on_finish,
+-                           ProgressContext *progress_ctx = nullptr) {
+-    assert(0 == "unexpected call");
+-    return nullptr;
+-  }
+-
+-  void send() {
+-  }
++class ImageSyncThrottler<librbd::MockTestImageCtx> {
+ };
+ 
+ namespace image_replayer {
+@@ -263,7 +248,6 @@ ReplayStatusFormatter<librbd::MockTestImageCtx>* ReplayStatusFormatter<librbd::M
+ 
+ // template definitions
+ #include "tools/rbd_mirror/ImageReplayer.cc"
+-#include "tools/rbd_mirror/ImageSyncThrottler.cc"
+ 
+ namespace rbd {
+ namespace mirror {
diff --git a/debian/patches/series b/debian/patches/series
index 7a2292e..3b04cab 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,6 @@ i386-build-fixes.patch
 0002-core-local-array-type-conversions.patch
 0003-Core-local-statistics.patch
 rgw-migrate-atomic_t-to-std_atomic.patch
+
+# Ubuntu: armhf link failure
+TestMockImageReplayer-cleanup.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ceph/ceph.git