[ptxdist] [PATCH] systemd: make tmpfiles support optional

[Albert Antony <albert@newtec.dk>]

Signed-off-by: Albert Antony <albert@newtec.dk>
---
 rules/systemd.in   | 14 ++++++++++++++
 rules/systemd.make |  8 +++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/rules/systemd.in b/rules/systemd.in
index 979e32c..1ecdb2b 100644
--- a/rules/systemd.in
+++ b/rules/systemd.in
@@ -94,5 +94,19 @@ config SYSTEMD_COREDUMP
 	help
 	  Enable this only if you need to debug a crashing systemd service
 
+config SYSTEMD_TMPFILES
+	bool
+	default y
+	prompt "enable tmpfiles support"
+	help
+	  Enable to automate management of temporary files and directories.
+	  This will install the systemd-tmpfiles application and its
+	  associated service and configuration files.
+
+	  "systemd-tmpfiles creates, deletes, and cleans up volatile and
+	  temporary files and directories, based on the configuration file
+	  format and location specified in tmpfiles.d"
+	   - http://www.freedesktop.org/software/systemd/man/systemd-tmpfiles.html
+
 endif
 
diff --git a/rules/systemd.make b/rules/systemd.make
index 46a5f97..7bfd33b 100644
--- a/rules/systemd.make
+++ b/rules/systemd.make
@@ -98,7 +98,7 @@ SYSTEMD_CONF_OPT	:= \
 	--$(call ptx/endis,PTXCONF_SYSTEMD_VCONSOLE)-vconsole \
 	--enable-bootchart \
 	--enable-quotacheck \
-	--enable-tmpfiles \
+	--$(call ptx/endis,PTXCONF_SYSTEMD_TMPFILES)-tmpfiles \
 	--disable-sysusers \
 	--disable-firstboot \
 	--$(call ptx/disen,PTXCONF_SYSTEMD_DISABLE_RANDOM_SEED)-randomseed \
@@ -161,9 +161,11 @@ endif
 ifndef PTXCONF_SYSTEMD_VCONSOLE
 	@rm -v $(SYSTEMD_PKGDIR)/etc/systemd/system/getty.target.wants/getty@tty1.service
 endif
+ifdef PTXCONF_SYSTEMD_TMPFILES
 #	# don't touch /etc and /home
 	@rm -v $(SYSTEMD_PKGDIR)/usr/lib/tmpfiles.d/etc.conf
 	@rm -v $(SYSTEMD_PKGDIR)/usr/lib/tmpfiles.d/home.conf
+endif
 #	# the upstream default (graphical.target) wants display-manager.service
 	@ln -sf multi-user.target $(SYSTEMD_PKGDIR)/lib/systemd/system/default.target
 	@$(call touch)
@@ -240,7 +242,9 @@ endif
 	@$(call install_copy, systemd, 0, 0, 0755, -, /bin/systemd-escape)
 	@$(call install_copy, systemd, 0, 0, 0755, -, /bin/systemd-machine-id-setup)
 	@$(call install_copy, systemd, 0, 0, 0755, -, /bin/systemd-notify)
+ifdef PTXCONF_SYSTEMD_TMPFILES
 	@$(call install_copy, systemd, 0, 0, 0755, -, /bin/systemd-tmpfiles)
+endif
 	@$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/busctl)
 	@$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/hostnamectl)
 ifdef PTXCONF_SYSTEMD_LOCALES
@@ -293,7 +297,9 @@ endif
 	@$(call install_tree, systemd, 0, 0, -, /etc/systemd/system/)
 	@$(call install_tree, systemd, 0, 0, -, /etc/dbus-1/system.d/)
 
+ifdef PTXCONF_SYSTEMD_TMPFILES
 	@$(call install_tree, systemd, 0, 0, -, /usr/lib/tmpfiles.d/)
+endif
 	@$(call install_copy, systemd, 0, 0, 0644, -, /usr/lib/sysctl.d/50-default.conf)
 
 ifdef PTXCONF_SYSTEMD_COREDUMP
-- 
2.0.0


-- 
ptxdist mailing list
ptxdist@pengutronix.de