mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Lars Pedersen <lapeddk@gmail.com>
Subject: Re: [ptxdist] [APPLIED] chrony: Add option for NTS support
Date: Sat, 12 Jul 2025 17:48:19 +0200	[thread overview]
Message-ID: <20250712154819.3675630-1-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20250709083513.399356-1-lapeddk@gmail.com>

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 \



      reply	other threads:[~2025-07-12 15:48 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-07-09  8:35 [ptxdist] [PATCH] " Lars Alex Pedersen
2025-07-12 15:48 ` Michael Olbrich [this message]

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=20250712154819.3675630-1-m.olbrich@pengutronix.de \
    --to=m.olbrich@pengutronix.de \
    --cc=lapeddk@gmail.com \
    --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