mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: [ptxdist] [PATCH] chrony: fix use of PHC and PTP reference clocks
Date: Mon, 25 Nov 2024 09:09:58 +0100	[thread overview]
Message-ID: <20241125080958.380467-1-a.fatoum@pengutronix.de> (raw)

Passing --disable-pps to ./configure doesn't matter if we unconditionally
disable all reference clock support anyway[1].

All of refclock, phc and pps are enabled by default, so let's add
options for refclock and phc that allow disabling them and add the
proper dependencies, so both CHRONY_PPS_REFCLK and CHRONY_PHC_REFCLK
can actually work.

[1]: https://gitlab.com/chrony/chrony/-/blob/4.6/configure?ref_type=tags#L773-794

Fixes: 2531a1942ed6 ("chrony: enable support for PPS devices")
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 rules/chrony.in   | 13 +++++++++++++
 rules/chrony.make |  4 ++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/rules/chrony.in b/rules/chrony.in
index 67a87277fc84..49226f58efba 100644
--- a/rules/chrony.in
+++ b/rules/chrony.in
@@ -45,13 +45,26 @@ config CHRONY_ADVANCED_COMMAND
 	  This allows getting advanced NTP time synchronization
 	  status monitoring from the service.
 
+config CHRONY_REFCLK
+	bool
+	prompt "Enable reference clock support"
+
 config CHRONY_PPS_REFCLK
 	bool
+	select CHRONY_REFCLK
 	prompt "Enable support for PPS devices"
 	help
 	  Pulse per second devices signal the start of every second
 	  with high precision.
 
+config CHRONY_PHC_REFCLK
+	bool
+	select CHRONY_REFCLK
+	prompt "Enable support for PHC devices"
+	help
+	  PTP hardware clock devices signal the start of every second
+	  with high precision.
+
 comment "install options   ---"
 
 config CHRONY_INSTALL_CHRONY_COMMAND
diff --git a/rules/chrony.make b/rules/chrony.make
index 33050fc2f858..647b78272020 100644
--- a/rules/chrony.make
+++ b/rules/chrony.make
@@ -50,8 +50,8 @@ CHRONY_CONF_OPT		:= \
 	--without-tomcrypt \
 	$(call ptx/ifdef, PTXCONF_CHRONY_ADVANCED_COMMAND,,--disable-cmdmon) \
 	$(call ptx/ifdef, PTXCONF_CHRONY_ADVANCED_COMMAND,--enable-debug,) \
-	--disable-refclock \
-	--disable-phc \
+	$(call ptx/ifdef, PTXCONF_CHRONY_REFCLK,,--disable-refclock) \
+	$(call ptx/ifdef, PTXCONF_CHRONY_PHC_REFCLK,,--disable-phc) \
 	$(call ptx/ifdef, PTXCONF_CHRONY_PPS_REFCLK,,--disable-pps) \
 	$(call ptx/ifdef, PTXCONF_GLOBAL_IPV6,,--disable-ipv6) \
 	--with-user=$(call ptx/ifdef, PTXCONF_INITMETHOD_SYSTEMD,chrony,root) \
-- 
2.39.5




                 reply	other threads:[~2024-11-25  8:10 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=20241125080958.380467-1-a.fatoum@pengutronix.de \
    --to=a.fatoum@pengutronix.de \
    --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