[Pkg-samba-maint] [Git][samba-team/samba][master] Disable cephfs support on architectures where it's not stable (Closes: #940697)

[Mathieu Parent]

Mathieu Parent pushed to branch master at Debian Samba Team / samba


Commits:
8c76b2d3 by John Paul Adrian Glaubitz at 2019-09-19T08:00:33Z
Disable cephfs support on architectures where it's not stable (Closes: #940697)

- - - - -


3 changed files:

- debian/changelog
- debian/control
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,5 +1,6 @@
 samba (2:4.11.0+dfsg-1) UNRELEASED; urgency=medium
 
+  [ Mathieu Parent ]
   * New upstream major release
     - Update d/gbp.conf, d/watch and d/README.source for 4.11
     - Import upstream release
@@ -14,7 +15,11 @@ samba (2:4.11.0+dfsg-1) UNRELEASED; urgency=medium
   * Add build-Remove-tests-for-getdents-and-getdirentries.patch, to fix FTBFS on
     armel and armhf
 
- -- Mathieu Parent <sathieu at debian.org>  Wed, 18 Sep 2019 08:30:33 +0200
+  [ John Paul Adrian Glaubitz ]
+  * Disable cephfs support on architectures where it's not stable
+    (Closes: #940697)
+
+ -- Mathieu Parent <sathieu at debian.org>  Thu, 19 Sep 2019 10:00:15 +0200
 
 samba (2:4.10.8+dfsg-1) unstable; urgency=medium
 


=====================================
debian/control
=====================================
@@ -23,7 +23,7 @@ Build-Depends: bison,
                libblkid-dev,
                libbsd-dev,
                libcap-dev [linux-any],
-               libcephfs-dev [linux-any],
+               libcephfs-dev [amd64 arm64 i386 mips64el ppc64el ppc64 x32],
                libcmocka-dev (>= 1.1.3),
                libcups2-dev,
                libdbus-1-dev,


=====================================
debian/rules
=====================================
@@ -70,12 +70,19 @@ conf_args = \
 		--with-logdir=/var/log/ctdb \
 		--enable-etcd-reclock
 
+ifeq (,$(filter amd64 arm64 i386 mips64el ppc64el ppc64 x32, $(DEB_HOST_ARCH)))
+        conf_args += \
+                --enable-ceph-reclock
+else
+        conf_args += \
+                --disable-cephfs
+endif
+
 ifeq ($(DEB_HOST_ARCH_OS), linux)
 	conf_args += \
 		--with-systemd \
 		--systemd-install-services \
-		--with-systemddir=/lib/systemd/system \
-		--enable-ceph-reclock
+		--with-systemddir=/lib/systemd/system
 else
 	conf_args += \
 		--without-systemd



View it on GitLab: https://salsa.debian.org/samba-team/samba/commit/8c76b2d3ee3617bf1fb5c70640d70029f7c207e5

-- 
View it on GitLab: https://salsa.debian.org/samba-team/samba/commit/8c76b2d3ee3617bf1fb5c70640d70029f7c207e5
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-samba-maint/attachments/20190919/c95c318a/attachment-0001.html>