From: Albert Antony <albert@newtec.dk>
To: ptxdist@pengutronix.de
Cc: Albert Antony <albert@newtec.dk>
Subject: [ptxdist] [PATCH] systemd: make tmpfiles support optional
Date: Wed, 5 Aug 2015 16:00:52 +0200 [thread overview]
Message-ID: <1438783252-29359-1-git-send-email-albert@newtec.dk> (raw)
Signed-off-by: Albert Antony <albert@newtec.dk>
---
rules/systemd.in | 5 +++++
rules/systemd.make | 8 +++++++-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/rules/systemd.in b/rules/systemd.in
index 979e32c..f5f17ae 100644
--- a/rules/systemd.in
+++ b/rules/systemd.in
@@ -94,5 +94,10 @@ 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"
+
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
next reply other threads:[~2015-08-05 12:04 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-05 14:00 Albert Antony [this message]
2015-08-06 8:41 ` Juergen Borleis
2015-08-06 14:38 ` Albert Antony
2015-10-01 14:16 ` Albert Antony
2015-08-06 14:39 ` Albert Antony
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1438783252-29359-1-git-send-email-albert@newtec.dk \
--to=albert@newtec.dk \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox