Thanks, applied as 7251ffe9266aed35122e5c5fb8eee8ecb5b25c78. Michael
[sent from post-receive hook] On Fri, 29 Nov 2024 09:10:20 +0100, Ahmad Fatoum <[email protected]> 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 <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > 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) \
