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 <[email protected]>
---
 rules/gpsd.in               | 4 ++--
 rules/gpsd.make             | 2 +-
 scripts/migrate/migrate_ptx | 2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/rules/gpsd.in b/rules/gpsd.in
index d01ce4291ac9..e4805a3cd2fc 100644
--- a/rules/gpsd.in
+++ b/rules/gpsd.in
@@ -183,10 +183,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 16a407cb505e..794e185ccaa7 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 484715cfeffe..76603c484afc 100755
--- a/scripts/migrate/migrate_ptx
+++ b/scripts/migrate/migrate_ptx
@@ -406,7 +406,9 @@ s/^\(\(# \)\?PTXCONF_SQLITE_LOAD_\)EXTENTION/\1EXTENSION/
 #
 # from   : ptxdist-2020.07.0
 # to     : ptxdist-2020.08.0
+# symbol : GPSD_DRIVER_UBX -> GPSD_DRIVER_UBLOX
 # symbol : GPSD_SYSTEMD_UNIT -> GPSD_SYSTEMD
 # reason : options were renamed / merged
 #
+s/^\(\(# \)\?PTXCONF_GPSD_DRIVER\)_UBX\>/\1_UBLOX/
 s/^\(\(# \)\?PTXCONF_GPSD_SYSTEMD\)_UNIT\>/\1/
-- 
2.27.0


_______________________________________________
ptxdist mailing list
[email protected]
To unsubscribe, send a mail with subject "unsubscribe" to 
[email protected]

Reply via email to