From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 29 Nov 2024 09:10:38 +0100 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1tGw5G-001mTb-06 for lore@lore.pengutronix.de; Fri, 29 Nov 2024 09:10:38 +0100 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1tGw5G-0002Go-53; Fri, 29 Nov 2024 09:10:38 +0100 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1tGw4y-0002Fc-C2; Fri, 29 Nov 2024 09:10:20 +0100 Received: from dude05.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::54]) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1tGw4x-000krx-1M; Fri, 29 Nov 2024 09:10:20 +0100 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1tGw4y-006s6G-0T; Fri, 29 Nov 2024 09:10:20 +0100 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Fri, 29 Nov 2024 09:10:20 +0100 Message-Id: <20241129081020.1637921-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241125080958.380467-1-a.fatoum@pengutronix.de> References: <20241125080958.380467-1-a.fatoum@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] chrony: fix use of PHC and PTP reference clocks X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Ahmad Fatoum Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as 7251ffe9266aed35122e5c5fb8eee8ecb5b25c78. Michael [sent from post-receive hook] On Fri, 29 Nov 2024 09:10:20 +0100, Ahmad Fatoum wrote: > 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 > Message-Id: <20241125080958.380467-1-a.fatoum@pengutronix.de> > Signed-off-by: Michael Olbrich > > 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) \