Merge ~ubuntu-server-dev/ubuntu/+source/ceph:xnox-groovy into ~ubuntu-server-dev/ubuntu/+source/ceph:ubuntu/groovy

[Dimitri John Ledkov]

d/rules,control: Enable boost context usage on s390x, it should be working correctly now. (LP: #1694926)

[Christian Ehrhardt  (paelzer)]

Hi xnox, Ceph would be under the Openstack Team, I added James as reviewer so that this MP is actually seen.

[Christian Ehrhardt  (paelzer)]

The default reviewer has no real job to do here - abstaining for "usd import team"

review: Abstain

[Chris MacNaughton (chris.macnaughton)]

Looks good to me and support does seem to have landed in the Boost packages for s390x

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 4960405..568de1f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ceph (15.2.3-0ubuntu2) UNRELEASED; urgency=medium
+
+  * d/rules,control: Enable boost context usage on s390x, it should be
+    working correctly now. (LP: #1694926)
+
+ -- Dimitri John Ledkov <[e-mail]>  Thu, 09 Jul 2020 12:53:53 +0100
+
 ceph (15.2.3-0ubuntu1) groovy; urgency=medium
 
   [ Chris MacNaughton ]
diff --git a/debian/control b/debian/control
index 2adb666..5570b3d 100644
--- a/debian/control
+++ b/debian/control
@@ -29,8 +29,8 @@ Build-Depends:
  libblkid-dev (>= 2.17),
  libboost-atomic-dev (>= 1.71.0),
  libboost-chrono-dev (>= 1.71.0),
- libboost-context-dev (>= 1.71.0) [!s390x !mips64el !ia64 !m68k !ppc64 !riscv64 !sh4 !sparc64 !x32],
- libboost-coroutine-dev (>= 1.71.0) [!s390x !mips64el !ia64 !m68k !ppc64 !riscv64 !sh4 !sparc64 !x32],
+ libboost-context-dev (>= 1.71.0) [!mips64el !ia64 !m68k !ppc64 !riscv64 !sh4 !sparc64 !x32],
+ libboost-coroutine-dev (>= 1.71.0) [!mips64el !ia64 !m68k !ppc64 !riscv64 !sh4 !sparc64 !x32],
  libboost-date-time-dev (>= 1.71.0),
  libboost-iostreams-dev (>= 1.71.0),
  libboost-program-options-dev (>= 1.71.0),
diff --git a/debian/rules b/debian/rules
index f0c7c8c..d1fa6fb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -76,7 +76,7 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
   extraopts += -DBOOST_J=$(NUMJOBS)
 endif
 
-ifneq (,$(findstring $(DEB_HOST_ARCH),s390x mips64el ia64 m68k ppc64 riscv64 sh4 sparc64 x32))
+ifneq (,$(findstring $(DEB_HOST_ARCH),mips64el ia64 m68k ppc64 riscv64 sh4 sparc64 x32))
   # beast depends on libboost_{context,coroutine} which is not supported on various archs
   extraopts += -DWITH_BOOST_CONTEXT=OFF
 else