From: Bruno Thomsen <bruno.thomsen@gmail.com>
To: ptxdist@pengutronix.de
Cc: Bruno Thomsen <bruno.thomsen@gmail.com>, bth@kamstrup.com
Subject: [ptxdist] [PATCH v3 3/7] chrony: systemd unit option
Date: Fri, 31 Jul 2020 18:11:37 +0200 [thread overview]
Message-ID: <20200731161141.6155-3-bruno.thomsen@gmail.com> (raw)
In-Reply-To: <20200731161141.6155-1-bruno.thomsen@gmail.com>
Install examples/chronyd.service from package as starting
point, it works great, otherwise use install_alternative.
Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
---
Changes since version 2:
- Remove chronyd.service from projectroot
- Install chronyd.service in install stage.
Changes since version 1:
- Fix install_alternative statement for service file.
- Added chrony-3.5/examples/chronyd.service to projectroot.
rules/chrony.in | 7 +++++++
rules/chrony.make | 18 ++++++++++++++++++
2 files changed, 25 insertions(+)
diff --git a/rules/chrony.in b/rules/chrony.in
index c81eba868..16b730199 100644
--- a/rules/chrony.in
+++ b/rules/chrony.in
@@ -95,6 +95,13 @@ endif
config CHRONY_STARTSCRIPT
bool
default y
+ depends on INITMETHOD_BBINIT
prompt "install /etc/init.d/chrony"
+config CHRONY_SYSTEMD_UNIT
+ bool
+ default y
+ depends on INITMETHOD_SYSTEMD
+ prompt "install systemd unit files"
+
endif
diff --git a/rules/chrony.make b/rules/chrony.make
index 9f20c413d..afdfe434a 100644
--- a/rules/chrony.make
+++ b/rules/chrony.make
@@ -55,6 +55,17 @@ CHRONY_CONF_OPT := \
$(call ptx/ifdef, PTXCONF_GLOBAL_IPV6,,--disable-ipv6) \
--without-seccomp
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/chrony.install:
+ @$(call targetinfo)
+ @$(call world/install, CHRONY)
+ @install -D -m 644 $(CHRONY_DIR)/examples/chronyd.service \
+ $(CHRONY_PKGDIR)/usr/lib/systemd/system/chronyd.service
+ @$(call touch)
+
# ----------------------------------------------------------------------------
# Target-Install
# ----------------------------------------------------------------------------
@@ -111,6 +122,13 @@ ifneq ($(call remove_quotes, $(PTXCONF_CHRONY_BBINIT_LINK)),)
endif
endif
endif
+
+ifdef PTXCONF_CHRONY_SYSTEMD_UNIT
+ @$(call install_alternative, chrony, 0, 0, 0644, /usr/lib/systemd/system/chronyd.service)
+ @$(call install_link, chrony, ../chronyd.service, \
+ /usr/lib/systemd/system/multi-user.target.wants/chronyd.service)
+endif
+
@$(call install_finish, chrony)
@$(call touch)
--
2.26.2
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
next prev parent reply other threads:[~2020-07-31 16:12 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-31 16:11 [ptxdist] [PATCH v3 1/7] chrony: version bump 3.3 -> 3.5 Bruno Thomsen
2020-07-31 16:11 ` [ptxdist] [PATCH v3 2/7] chrony: nettle authentication support Bruno Thomsen
2020-08-03 6:30 ` [ptxdist] [APPLIED] " Michael Olbrich
2020-07-31 16:11 ` Bruno Thomsen [this message]
2020-08-03 6:30 ` [ptxdist] [APPLIED] chrony: systemd unit option Michael Olbrich
2020-07-31 16:11 ` [ptxdist] [PATCH v3 4/7] passwd/group: added chrony UID/GID Bruno Thomsen
2020-08-03 6:30 ` [ptxdist] [APPLIED] " Michael Olbrich
2020-07-31 16:11 ` [ptxdist] [PATCH v3 5/7] chrony: run chronyd as chrony user Bruno Thomsen
2020-08-03 6:30 ` [ptxdist] [APPLIED] " Michael Olbrich
2020-07-31 16:11 ` [ptxdist] [PATCH v3 6/7] chrony: advanced monitoring command option Bruno Thomsen
2020-08-03 6:30 ` [ptxdist] [APPLIED] " Michael Olbrich
2020-07-31 16:11 ` [ptxdist] [PATCH v3 7/7] chrony: make unrecognized configure options fatal Bruno Thomsen
2020-08-03 6:29 ` Michael Olbrich
2020-08-03 6:30 ` [ptxdist] [APPLIED] " Michael Olbrich
2020-08-03 6:30 ` [ptxdist] [APPLIED] chrony: version bump 3.3 -> 3.5 Michael Olbrich
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=20200731161141.6155-3-bruno.thomsen@gmail.com \
--to=bruno.thomsen@gmail.com \
--cc=bth@kamstrup.com \
--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