From: Peter Michael Green <plugwash@raspbian.org>
Date: Thu, 30 Jan 2020 19:46:53 +0000 (+0000)
Subject: Manual merge of version 14.2.6-4+rpi1 and 14.2.6-5 to produce 14.2.6-5+rpi1
X-Git-Tag: archive/raspbian/14.2.6-5+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3b2a92c3e71b7ce3ab94e364862f5d2dda259f82;p=ceph.git

Manual merge of version 14.2.6-4+rpi1 and 14.2.6-5 to produce 14.2.6-5+rpi1
---

3b2a92c3e71b7ce3ab94e364862f5d2dda259f82
diff --cc debian/changelog
index 2d9fb1d61,21aaecead..e5d4d3beb
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,18 +1,31 @@@
- ceph (14.2.6-4+rpi1) bullseye-staging; urgency=medium
++ceph (14.2.6-5+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 10.2.5-7.2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 30 Jul 2017 09:48:17 +0000]
 +  * Add Raspbian to lists of "debian-like" distros.
 +    + Hopefully this will fix site-packages vs dist-packages
 +      build failure in Raspbian.
 + 
 +  [changes introduced in 14.2.5-3+rpi1 by Peter Michael Green]
 +  * Remove problematic gitattributes files.
 +  * Disable neon on armhf too.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Tue, 21 Jan 2020 16:10:31 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 30 Jan 2020 19:46:20 +0000
++
+ ceph (14.2.6-5) unstable; urgency=medium
+ 
+   * [966df1a] Removing cython from Build-deps.
+     Thanks to Sandro Tosi (Closes: #936282)
+   * [38fdd89] clang ist not available on sh4
+   * [3c97474] Replace findstring by filter where needed.
+     Thanks jrtc27 for the hint.
+   * [c694d0d] Pass -DHAVE_NEON=0 to cmake on armel.
+     Instead of "fixing" CMakeCache.txt.
+   * [825a942] Revert "Don't build ceph on mipsel."
+     This reverts commit 424ea9b82f956daa8fa9c0539d0752ccfdc7caf6.
+     Thanks to peter green (Closes: #949528)
+   * [79aef26] Remove merge fail
+ 
+  -- Bernd Zeimetz <bzed@debian.org>  Tue, 21 Jan 2020 21:21:17 +0100
  
  ceph (14.2.6-4) unstable; urgency=high
  
diff --cc debian/rules
index b93f4b6c7,4f5c24102..2e8740475
--- a/debian/rules
+++ b/debian/rules
@@@ -28,8 -28,13 +28,16 @@@ els
      endif
  endif
  
+ # we don't have NEON on armel.
+ ifeq ($(DEB_HOST_ARCH),armel)
+     extraopts += -DHAVE_ARM_NEON=0
+ endif
++ifeq ($(DEB_HOST_ARCH),armhf)
++    extraopts += -DHAVE_ARM_NEON=0
++endif
+ 
  # disable ceph-dencoder on mipsel to avoid clang oom
- ifneq (,$(findstring -$(DEB_HOST_ARCH)-,-mipsel-))
+ ifneq (,$(filter $(DEB_HOST_ARCH),mipsel))
      extraopts += -DDISABLE_DENCODER=1
  endif