Re: [ptxdist] [APPLIED] gpsd: make 'ublox' driver option more recognizable

[Michael Olbrich <mol@pengutronix.de>]

Thanks, applied as efbaa479410eaef575b602d832882eb21f688e04.

Michael

[sent from post-receive hook]

On Mon, 03 Aug 2020 08:29:54 +0200, Roland Hieber <rhi@pengutronix.de> wrote:
> The configure option itself is named 'ublox', so there is no reason to
> unnecessarily abbreviate the option in the menu and make it harder to
> recognize.
> 
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> Message-Id: <20200722095343.16640-1-rhi@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/gpsd.in b/rules/gpsd.in
> index 16b6dcb70a72..6d1db1495f3f 100644
> --- a/rules/gpsd.in
> +++ b/rules/gpsd.in
> @@ -188,10 +188,10 @@ menu "drivers"
>  		bool
>  		prompt "tnt"
>  
> -	config GPSD_DRIVER_UBX
> +	config GPSD_DRIVER_UBLOX
>  		bool
>  		select GPSD_DRIVER_NMEA
> -		prompt "ubx"
> +		prompt "ublox"
>  
>  	config GPSD_DRIVER_EVERMORE
>  		bool
> diff --git a/rules/gpsd.make b/rules/gpsd.make
> index f75caa5b4bbd..6ebd8bd3bca7 100644
> --- a/rules/gpsd.make
> +++ b/rules/gpsd.make
> @@ -121,7 +121,7 @@ GPSD_CONF_OPT	:= \
>  	tnt=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_TNT) \
>  	tripmate=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_TRIPMATE) \
>  	tsip=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_TSIP) \
> -	ublox=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_UBX) \
> +	ublox=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_UBLOX) \
>  	udevdir=/usr/lib/udev \
>  	usb=$(call ptx/yesno, PTXCONF_GPSD_USB) \
>  	xgps=no
> diff --git a/scripts/migrate/migrate_ptx b/scripts/migrate/migrate_ptx
> index 34c9a5ccedf8..1603d634476b 100755
> --- a/scripts/migrate/migrate_ptx
> +++ b/scripts/migrate/migrate_ptx
> @@ -402,3 +402,11 @@ s/^\(\(# \)\?PTXCONF_GST_PLUGINS_\)BAD1_STEREO\>/\1GOOD1_AUDIOFX/
>  # reason : option was renamed
>  #
>  s/^\(\(# \)\?PTXCONF_SQLITE_LOAD_\)EXTENTION/\1EXTENSION/
> +
> +#
> +# from   : ptxdist-2020.07.0
> +# to     : ptxdist-2020.08.0
> +# symbol : GPSD_DRIVER_UBX -> GPSD_DRIVER_UBLOX
> +# reason : options were renamed / merged
> +#
> +s/^\(\(# \)\?PTXCONF_GPSD_DRIVER\)_UBX\>/\1_UBLOX/

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de