From: Roland Hieber <rhi@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Roland Hieber <rhi@pengutronix.de>
Subject: [ptxdist] [PATCH 2/3] gpsd: make 'ublox' driver option more recognizable
Date: Mon, 20 Jul 2020 13:51:16 +0200 [thread overview]
Message-ID: <20200720115117.21293-2-rhi@pengutronix.de> (raw)
In-Reply-To: <20200720115117.21293-1-rhi@pengutronix.de>
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>
---
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
next prev parent reply other threads:[~2020-07-20 11:51 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-20 11:51 [ptxdist] [PATCH 1/3] gpsd: merge GPSD_SYSTEMD and GPSD_SYSTEMD_UNIT options Roland Hieber
2020-07-20 11:51 ` Roland Hieber [this message]
2020-07-20 11:51 ` [ptxdist] [PATCH 3/3] gpsd: fix usage of GPSD_DRIVER_NTRIP option Roland Hieber
2020-07-20 12:59 ` [ptxdist] [PATCH 1/3] gpsd: merge GPSD_SYSTEMD and GPSD_SYSTEMD_UNIT options Michael Olbrich
2020-07-20 21:14 ` ladis
2020-07-22 9:51 ` Roland Hieber
2020-07-22 9:53 ` [ptxdist] [PATCH v2 1/3] gpsd: make 'ublox' driver option more recognizable Roland Hieber
2020-07-22 9:53 ` [ptxdist] [PATCH v2 2/3] gpsd: fix usage of GPSD_DRIVER_NTRIP option Roland Hieber
2020-08-03 6:29 ` [ptxdist] [APPLIED] " Michael Olbrich
2020-07-22 9:53 ` [ptxdist] [PATCH v2 3/3] gpsd: make GPSD_SYSTEMD promptless and fix dependency Roland Hieber
2020-08-03 6:29 ` [ptxdist] [APPLIED] " Michael Olbrich
2020-08-03 6:29 ` [ptxdist] [APPLIED] gpsd: make 'ublox' driver option more recognizable Michael Olbrich
2020-08-02 14:43 ` [ptxdist] [PATCH 1/3] gpsd: merge GPSD_SYSTEMD and GPSD_SYSTEMD_UNIT options ladis
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=20200720115117.21293-2-rhi@pengutronix.de \
--to=rhi@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