From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-yk0-f172.google.com ([209.85.160.172]) by metis.ext.pengutronix.de with esmtps (TLS1.2:RSA_ARCFOUR_SHA1:128) (Exim 4.80) (envelope-from ) id 1Zhefl-0005vG-1B for ptxdist@pengutronix.de; Thu, 01 Oct 2015 16:17:25 +0200 Received: by ykdz138 with SMTP id z138so80265566ykd.2 for ; Thu, 01 Oct 2015 07:17:18 -0700 (PDT) MIME-Version: 1.0 In-Reply-To: <1438871921-6004-1-git-send-email-albert@newtec.dk> References: <201508061041.21199.jbe@pengutronix.de> <1438871921-6004-1-git-send-email-albert@newtec.dk> From: Albert Antony Date: Thu, 1 Oct 2015 16:16:58 +0200 Message-ID: Subject: Re: [ptxdist] [PATCH] systemd: make tmpfiles support optional List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Content-Type: multipart/mixed; boundary="===============1239112538==" Errors-To: ptxdist-bounces@pengutronix.de Sender: "ptxdist" To: ptxdist@pengutronix.de --===============1239112538== Content-Type: multipart/alternative; boundary=94eb2c0826e45c249b05210bb4e4 --94eb2c0826e45c249b05210bb4e4 Content-Type: text/plain; charset=UTF-8 Bump :) On 6 August 2015 at 16:38, Albert Antony wrote: > Signed-off-by: Albert Antony > --- > 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 > > --94eb2c0826e45c249b05210bb4e4 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
Bump :)

On 6 August 2015 at 16:38, Albert Antony <= ;albert@newtec.dk= > wrote:
Signe= d-off-by: Albert Antony <albert@newt= ec.dk>
---
=C2=A0rules/systemd.in=C2=A0 =C2=A0| 14 ++++++++++++++
=C2=A0rules/systemd.make |=C2=A0 8 +++++++-
=C2=A02 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
=C2=A0 =C2=A0 =C2=A0 =C2=A0 help
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 Enable this only if you need to debug a = crashing systemd service

+config SYSTEMD_TMPFILES
+=C2=A0 =C2=A0 =C2=A0 =C2=A0bool
+=C2=A0 =C2=A0 =C2=A0 =C2=A0default y
+=C2=A0 =C2=A0 =C2=A0 =C2=A0prompt "enable tmpfiles support"
+=C2=A0 =C2=A0 =C2=A0 =C2=A0help
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0Enable to automate management of tempora= ry files and directories.
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0This will install the systemd-tmpfiles a= pplication and its
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0associated service and configuration fil= es.
+
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"systemd-tmpfiles creates, deletes,= and cleans up volatile and
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0temporary files and directories, based o= n the configuration file
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0format and location specified in tmpfile= s.d"
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 - http://www.freedesktop.org/software/systemd/man/systemd-tmpfiles.htm= l
+
=C2=A0endif

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=C2=A0 =C2=A0 =C2=A0 :=3D \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 --$(call ptx/endis,PTXCONF_SYSTEMD_VCONSOLE)-vc= onsole \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 --enable-bootchart \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 --enable-quotacheck \
-=C2=A0 =C2=A0 =C2=A0 =C2=A0--enable-tmpfiles \
+=C2=A0 =C2=A0 =C2=A0 =C2=A0--$(call ptx/endis,PTXCONF_SYSTEMD_TMPFILES)-tm= pfiles \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 --disable-sysusers \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 --disable-firstboot \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 --$(call ptx/disen,PTXCONF_SYSTEMD_DISABLE_RAND= OM_SEED)-randomseed \
@@ -161,9 +161,11 @@ endif
=C2=A0ifndef PTXCONF_SYSTEMD_VCONSOLE
=C2=A0 =C2=A0 =C2=A0 =C2=A0 @rm -v $(SYSTEMD_PKGDIR)/etc/systemd/system/get= ty.target.wants/getty@tty1.service
=C2=A0endif
+ifdef PTXCONF_SYSTEMD_TMPFILES
=C2=A0#=C2=A0 =C2=A0 =C2=A0 # don't touch /etc and /home
=C2=A0 =C2=A0 =C2=A0 =C2=A0 @rm -v $(SYSTEMD_PKGDIR)/usr/lib/tmpfiles.d/etc= .conf
=C2=A0 =C2=A0 =C2=A0 =C2=A0 @rm -v $(SYSTEMD_PKGDIR)/usr/lib/tmpfiles.d/hom= e.conf
+endif
=C2=A0#=C2=A0 =C2=A0 =C2=A0 # the upstream default (graphical.target) wants= display-manager.service
=C2=A0 =C2=A0 =C2=A0 =C2=A0 @ln -sf multi-user.target $(SYSTEMD_PKGDIR)/lib= /systemd/system/default.target
=C2=A0 =C2=A0 =C2=A0 =C2=A0 @$(call touch)
@@ -240,7 +242,9 @@ endif
=C2=A0 =C2=A0 =C2=A0 =C2=A0 @$(call install_copy, systemd, 0, 0, 0755, -, /= bin/systemd-escape)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 @$(call install_copy, systemd, 0, 0, 0755, -, /= bin/systemd-machine-id-setup)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 @$(call install_copy, systemd, 0, 0, 0755, -, /= bin/systemd-notify)
+ifdef PTXCONF_SYSTEMD_TMPFILES
=C2=A0 =C2=A0 =C2=A0 =C2=A0 @$(call install_copy, systemd, 0, 0, 0755, -, /= bin/systemd-tmpfiles)
+endif
=C2=A0 =C2=A0 =C2=A0 =C2=A0 @$(call install_copy, systemd, 0, 0, 0755, -, /= usr/bin/busctl)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 @$(call install_copy, systemd, 0, 0, 0755, -, /= usr/bin/hostnamectl)
=C2=A0ifdef PTXCONF_SYSTEMD_LOCALES
@@ -293,7 +297,9 @@ endif
=C2=A0 =C2=A0 =C2=A0 =C2=A0 @$(call install_tree, systemd, 0, 0, -, /etc/sy= stemd/system/)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 @$(call install_tree, systemd, 0, 0, -, /etc/db= us-1/system.d/)

+ifdef PTXCONF_SYSTEMD_TMPFILES
=C2=A0 =C2=A0 =C2=A0 =C2=A0 @$(call install_tree, systemd, 0, 0, -, /usr/li= b/tmpfiles.d/)
+endif
=C2=A0 =C2=A0 =C2=A0 =C2=A0 @$(call install_copy, systemd, 0, 0, 0644, -, /= usr/lib/sysctl.d/50-default.conf)

=C2=A0ifdef PTXCONF_SYSTEMD_COREDUMP
--
2.0.0


--94eb2c0826e45c249b05210bb4e4-- --===============1239112538== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline LS0gCnB0eGRpc3QgbWFpbGluZyBsaXN0CnB0eGRpc3RAcGVuZ3V0cm9uaXguZGUK --===============1239112538==--