From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: From: Roland Hieber Date: Mon, 20 Jul 2020 13:51:16 +0200 Message-Id: <20200720115117.21293-2-rhi@pengutronix.de> In-Reply-To: <20200720115117.21293-1-rhi@pengutronix.de> References: <20200720115117.21293-1-rhi@pengutronix.de> MIME-Version: 1.0 Subject: [ptxdist] [PATCH 2/3] gpsd: make 'ublox' driver option more recognizable List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ptxdist-bounces@pengutronix.de Sender: "ptxdist" To: ptxdist@pengutronix.de Cc: Roland Hieber 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 --- 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 ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de