mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Subject: Re: [ptxdist] [PATCH] ntp: update configure options
Date: Mon, 19 Mar 2018 16:16:09 +0100	[thread overview]
Message-ID: <20180319151609.7yshcprveikn4v76@pengutronix.de> (raw)
In-Reply-To: <20180313155459.2220-1-bst@pengutronix.de>

On Tue, Mar 13, 2018 at 04:54:59PM +0100, Bastian Stender wrote:
> --enable-ARCRON_MSF is actually --enable-ARCRON-MSF
> 
> --enable-arlib is now --with-arlib
> 
> --enable-udp-wildcard removed in 4848b7bf9 ("Lose UDP_WILDCARD_DELIVERY")
> 
> --enable-MSFEES removed in ba7975983 ("[Bug 340, 342] Deprecate broken TRAK and MSF EES refclocks")
> --enable-TRAK removed in ba7975983 ("[Bug 340, 342] Deprecate broken TRAK and MSF EES refclocks")
> 
> --enable-PTBACTS removed in e0da3f545 ("Remove PTB and USNO lint")
> 
> Signed-off-by: Bastian Stender <bst@pengutronix.de>
> ---
>  rules/ntp.in          |  6 ------
>  rules/ntp.make        | 16 ++--------------
>  rules/ntp_nonparse.in | 12 ------------
>  3 files changed, 2 insertions(+), 32 deletions(-)
> 
> diff --git a/rules/ntp.in b/rules/ntp.in
> index 9f85406ab..73120c961 100644
> --- a/rules/ntp.in
> +++ b/rules/ntp.in
> @@ -103,12 +103,6 @@ config NTP_SIMULATOR
>  	help
>  	  FIXME: This item needs to be documented
>  
> -config NTP_UDP_WILDCARD
> -	bool
> -	prompt "use UDP wildcard delivery"
> -	help
> -	  FIXME: This item needs to be documented
> -
>  config NTP_SLEW_ALWAYS
>  	bool
>  	prompt "always slew the time"
> diff --git a/rules/ntp.make b/rules/ntp.make
> index 67405c47b..4d9c5a975 100644
> --- a/rules/ntp.make
> +++ b/rules/ntp.make
> @@ -81,7 +81,7 @@ ifdef PTXCONF_NTP_ARBITER
>  NTP_AUTOCONF += --enable-ARBITER
>  endif
>  ifdef PTXCONF_NTP_ARCRON_MSF
> -NTP_AUTOCONF += --enable-ARCRON_MSF
> +NTP_AUTOCONF += --enable-ARCRON-MSF
>  endif
>  ifdef PTXCONF_NTP_AS2201
>  NTP_AUTOCONF += --enable-AS2201
> @@ -137,9 +137,6 @@ endif
>  ifdef PTXCONF_NTP_LOCAL_CLOCK
>  NTP_AUTOCONF += --enable-LOCAL-CLOCK
>  endif
> -ifdef PTXCONF_NTP_MSFEES
> -NTP_AUTOCONF += --enable-MSFEES
> -endif
>  ifdef PTXCONF_NTP_MX4200
>  NTP_AUTOCONF += --enable-MX4200
>  endif
> @@ -161,9 +158,6 @@ endif
>  ifdef PTXCONF_NTP_PST
>  NTP_AUTOCONF += --enable-PST
>  endif
> -ifdef PTXCONF_NTP_PTBACTS
> -NTP_AUTOCONF += --enable-PTBACTS
> -endif
>  ifdef PTXCONF_NTP_RIPENCC
>  NTP_AUTOCONF += --enable-RIPENCC
>  endif
> @@ -179,9 +173,6 @@ endif
>  ifdef PTXCONF_NTP_TPRO
>  NTP_AUTOCONF += --enable-TPRO
>  endif
> -ifdef PTXCONF_NTP_TRAK
> -NTP_AUTOCONF += --enable-TRAK
> -endif
>  ifdef PTXCONF_NTP_TRUETIME
>  NTP_AUTOCONF += --enable-TRUETIME
>  endif
> @@ -248,9 +239,6 @@ endif
>  ifdef PTXCONF_NTP_SIMULATOR
>  NTP_AUTOCONF += --enable-simulator
>  endif
> -ifdef PTXCONF_NTP_UDP_WILDCARD
> -NTP_AUTOCONF += --enable-udp-wildcard
> -endif
>  ifdef PTXCONF_NTP_SLEW_ALWAYS
>  NTP_AUTOCONF += --enable-slew-always
>  endif
> @@ -286,7 +274,7 @@ ifdef PTXCONF_NTP_SNTP
>  NTP_AUTOCONF += --with-sntp
>  endif
>  ifdef PTXCONF_NTP_ARLIB
> -NTP_AUTOCONF += --enable-arlib
> +NTP_AUTOCONF += --with-arlib
>  endif

Can you please turn all this stuff into proper ptx/endis ptx/wwo options?
I've looked at the configure.ac and it should handle --disable-* correctly.
Also: some options seem to have some autodetection as default.

And please use configure_helper.py to check if there are some more options
that should be checked.

Michael

>  
>  # ----------------------------------------------------------------------------
> diff --git a/rules/ntp_nonparse.in b/rules/ntp_nonparse.in
> index 397b6e00a..13c38d887 100644
> --- a/rules/ntp_nonparse.in
> +++ b/rules/ntp_nonparse.in
> @@ -98,10 +98,6 @@ config NTP_LOCAL_CLOCK
>  	  Enables the driver for the internal PC CMOS clock. This clock
>  	  is mostly unreliable, but suitable as a fall back time source.
>  
> -config NTP_MSFEES
> -	bool
> -	prompt "EES M201 MSF receiver"
> -
>  config NTP_MX4200
>  	bool
>  	prompt "Magnavox MX4200 GPS receiver "
> @@ -130,10 +126,6 @@ config NTP_PST
>  	bool
>  	prompt "PST/Traconex 1020 WWV/WWVH receiver"
>  
> -config NTP_PTBACTS
> -	bool
> -	prompt "PTB modem service"
> -
>  config NTP_RIPENCC
>  	bool
>  	prompt "RIPENCC specific Trimble driver"
> @@ -154,10 +146,6 @@ config NTP_TPRO
>  	prompt "KSI/Odetics TPRO/S GPS receiver/IRIG interface [BROKEN]"
>  	depends on BROKEN
>  
> -config NTP_TRAK
> -	bool
> -	prompt "TRAK 8810 GPS receiver"
> -
>  config NTP_TRUETIME
>  	bool
>  	prompt "Kinemetrics/TrueTime receivers"
> -- 
> 2.16.1
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

      reply	other threads:[~2018-03-19 15:16 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-03-13 15:54 Bastian Stender
2018-03-19 15:16 ` 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=20180319151609.7yshcprveikn4v76@pengutronix.de \
    --to=m.olbrich@pengutronix.de \
    --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