[Pkg-samba-maint] [Git][samba-team/samba][master] 2 commits: Fix systemd-related build failures on non-Linux

[Mathieu Parent]

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


Commits:
67fa855f by James Clarke at 2018-10-28T11:13:01Z
Fix systemd-related build failures on non-Linux

- - - - -
f0631578 by Mathieu Parent at 2018-10-29T21:45:06Z
Merge branch 'non-linux' into 'master'

Fix systemd-related build failures on non-Linux

See merge request samba-team/samba!11
- - - - -


4 changed files:

- debian/ctdb.install
- debian/rules
- debian/samba.install
- debian/winbind.install


Changes:

=====================================
debian/ctdb.install
=====================================
@@ -1,9 +1,10 @@
+#!/usr/bin/dh-exec --with-scripts=filter-arch
 ctdb/config/ctdb.conf etc/ctdb
 ctdb/config/ctdb.tunables etc/ctdb
 ctdb/config/script.options etc/ctdb
 etc/ctdb
 etc/sudoers.d
-lib/systemd/system/ctdb.service
+[linux-any] lib/systemd/system/ctdb.service
 usr/bin/ctdb
 usr/bin/ctdb_diagnostics
 usr/bin/ltdbtool


=====================================
debian/rules
=====================================
@@ -144,6 +144,7 @@ override_dh_auto_install:
 	rm $(DESTDIR)/usr/bin/ctdb_run_cluster_tests
 	rm -r $(DESTDIR)/usr/lib/*/ctdb/tests
 	rm -r $(DESTDIR)/usr/share/ctdb/tests
+ifeq ($(DEB_HOST_ARCH_OS), linux)
 	# Install systemd configs
 	mkdir -p $(DESTDIR)/lib/systemd/system/
 	install -m 0644 ctdb/config/ctdb.service $(DESTDIR)/lib/systemd/system/
@@ -160,6 +161,9 @@ override_dh_auto_install:
 	  $(DESTDIR)/lib/systemd/system/samba-ad-dc.service \
 	  $(DESTDIR)/lib/systemd/system/smbd.service \
 	  $(DESTDIR)/lib/systemd/system/winbind.service
+endif
+	# Harmless on systems without systemd-tmpfiles, and other consumers existm
+	# such as OpenRC's opentmpfiles
 	mkdir -p $(DESTDIR)/usr/lib/tmpfiles.d
 	echo "d /run/samba 0755 root root -" > $(DESTDIR)/usr/lib/tmpfiles.d/samba.conf
 


=====================================
debian/samba.install
=====================================
@@ -1,7 +1,8 @@
+#!/usr/bin/dh-exec --with-scripts=filter-arch
 etc/ufw/applications.d/samba
-lib/systemd/system/nmbd.service
-lib/systemd/system/samba-ad-dc.service
-lib/systemd/system/smbd.service
+[linux-any] lib/systemd/system/nmbd.service
+[linux-any] lib/systemd/system/samba-ad-dc.service
+[linux-any] lib/systemd/system/smbd.service
 usr/bin/mvxattr
 usr/bin/oLschema2ldif
 usr/bin/pdbedit


=====================================
debian/winbind.install
=====================================
@@ -1,4 +1,5 @@
-lib/systemd/system/winbind.service
+#!/usr/bin/dh-exec --with-scripts=filter-arch
+[linux-any] lib/systemd/system/winbind.service
 usr/bin/ntlm_auth
 usr/bin/wbinfo
 usr/lib/*/samba/idmap



View it on GitLab: https://salsa.debian.org/samba-team/samba/compare/fa0bc9cddfa0322d0d7695675e52f8c3b016a8e7...f0631578df94376d9b8e0e5c8ea30dcaa6a36412

-- 
View it on GitLab: https://salsa.debian.org/samba-team/samba/compare/fa0bc9cddfa0322d0d7695675e52f8c3b016a8e7...f0631578df94376d9b8e0e5c8ea30dcaa6a36412
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/20181029/035d6daa/attachment-0001.html>