From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: From: Roland Hieber Date: Wed, 22 Jul 2020 11:53:41 +0200 Message-Id: <20200722095343.16640-1-rhi@pengutronix.de> In-Reply-To: <20200722095130.fw5rclsoneafuqpt@pengutronix.de> References: <20200722095130.fw5rclsoneafuqpt@pengutronix.de> MIME-Version: 1.0 Subject: [ptxdist] [PATCH v2 1/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 --- * v1 -> v2: no changes --- rules/gpsd.in | 4 ++-- rules/gpsd.make | 2 +- scripts/migrate/migrate_ptx | 8 ++++++++ 3 files changed, 11 insertions(+), 3 deletions(-) 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/ -- 2.27.0 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de