Thanks, applied as d2df9f26bef274e24edd9e26a88ce5970c065d75.

Michael

[sent from post-receive hook]

On Sat, 12 Jul 2025 17:48:19 +0200, Lars Pedersen <[email protected]> wrote:
> chrony was compiled implicitly with NTS support enabled, but it also
> required gnutls. This commit makes the option explicit and selects
> gnutls and CHRONY_USE_NETTLE
> 
> Signed-off-by: Lars Alex Pedersen <[email protected]>
> Message-Id: <[email protected]>
> Signed-off-by: Michael Olbrich <[email protected]>
> 
> diff --git a/rules/chrony.in b/rules/chrony.in
> index 49226f58efba..9805b7a2c746 100644
> --- a/rules/chrony.in
> +++ b/rules/chrony.in
> @@ -6,6 +6,7 @@ menuconfig CHRONY
>       prompt "chrony                        "
>       select LIBC_M
>       select LIBCAP
> +     select GNUTLS           if CHRONY_ENABLE_NTS
>       select LIBSECCOMP       if CHRONY_SECCOMP
>       select NETTLE           if CHRONY_USE_NETTLE
>       select PPS_TOOLS        if CHRONY_PPS_REFCLK
> @@ -24,6 +25,13 @@ menuconfig CHRONY
>  
>  if CHRONY
>  
> +config CHRONY_ENABLE_NTS
> +     bool
> +     prompt "Enable NTS support"
> +     select CHRONY_USE_NETTLE
> +     help
> +       Enable NTS support
> +
>  config CHRONY_USE_NETTLE
>       bool
>       prompt "Use nettle crypto library"
> diff --git a/rules/chrony.make b/rules/chrony.make
> index ee58ae1641e9..b0e28c4d2b45 100644
> --- a/rules/chrony.make
> +++ b/rules/chrony.make
> @@ -44,6 +44,7 @@ CHRONY_CONF_OPT             := \
>       --sysconfdir=/etc \
>       --disable-readline \
>       --without-editline \
> +     $(call ptx/ifdef, PTXCONF_CHRONY_ENABLE_NTS,,--disable-nts) \
>       $(call ptx/ifdef, PTXCONF_CHRONY_USE_NETTLE,,--disable-sechash) \
>       $(call ptx/ifdef, PTXCONF_CHRONY_USE_NETTLE,,--without-nettle) \
>       --without-nss \

Reply via email to