[ptxdist] [PATCH] chrony: Add option for NTS support

[ptxdist] [PATCH] chrony: Add option for NTS support

[Lars Alex Pedersen]

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 <lapeddk@gmail.com>
---
 rules/chrony.in   | 8 ++++++++
 rules/chrony.make | 1 +
 2 files changed, 9 insertions(+)

diff --git a/rules/chrony.in b/rules/chrony.in
index 49226f58e..9805b7a2c 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 ee58ae164..b0e28c4d2 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 \

base-commit: 51f6fea554acb994e4f082af28077e82aab221cc
-- 
2.50.0

Re: [ptxdist] [APPLIED] chrony: Add option for NTS support

[Michael Olbrich]

Thanks, applied as d2df9f26bef274e24edd9e26a88ce5970c065d75.

Michael

[sent from post-receive hook]

On Sat, 12 Jul 2025 17:48:19 +0200, Lars Pedersen <lapeddk@gmail.com> 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 <lapeddk@gmail.com>
> Message-Id: <20250709083513.399356-1-lapeddk@gmail.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> 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 \