[ptxdist] [PATCH 1/3] gpsd: merge GPSD_SYSTEMD and GPSD_SYSTEMD_UNIT options

[Roland Hieber <rhi@pengutronix.de>]

The current systemd socket unit relies on compiled-in systemd support in
the gpsd binary, so we would need to enable GPSD_SYSTEMD with
GPSD_SYSTEMD_UNIT anyways. Vice versa, there is no use in having
compiled-in systemd socket activation support without the systemd socket
unit. Merge both options.

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 rules/gpsd.in               | 9 ++-------
 rules/gpsd.make             | 2 +-
 scripts/migrate/migrate_ptx | 8 ++++++++
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/rules/gpsd.in b/rules/gpsd.in
index 16b6dcb70a72..d01ce4291ac9 100644
--- a/rules/gpsd.in
+++ b/rules/gpsd.in
@@ -63,11 +63,6 @@ config GPSD_USB
 
 comment "Other options    ---"
 
-config GPSD_SYSTEMD
-	bool
-	depends on SYSTEMD
-	prompt "systemd"
-
 config GPSD_RECONFIGURE
 	bool
 	prompt "enable reconfigure"
@@ -260,7 +255,7 @@ menu "install options"
 		  queries with a format that is substantially easier to
 		  parse than the NMEA 0183 emitted by most GPS receivers.
 
-	config GPSD_SYSTEMD_UNIT
+	config GPSD_SYSTEMD
 		bool
 		default y
 		depends on INITMETHOD_SYSTEMD && GPSD_GPSD
@@ -268,7 +263,7 @@ menu "install options"
 
 	config GPSD_GPSD_ARGS
 		string
-		depends on GPSD_SYSTEMD_UNIT
+		depends on GPSD_SYSTEMD
 		prompt "gpsd arguments"
 
 	config GPSD_GPS2UDP
diff --git a/rules/gpsd.make b/rules/gpsd.make
index f75caa5b4bbd..16a407cb505e 100644
--- a/rules/gpsd.make
+++ b/rules/gpsd.make
@@ -160,7 +160,7 @@ $(STATEDIR)/gpsd.targetinstall:
 ifdef PTXCONF_GPSD_GPSD
 	@$(call install_copy, gpsd, 0, 0, 0755, -, /usr/sbin/gpsd)
 endif
-ifdef PTXCONF_GPSD_SYSTEMD_UNIT
+ifdef PTXCONF_GPSD_SYSTEMD
 	@$(call install_alternative, gpsd, 0, 0, 644, \
 		/usr/lib/systemd/system/gpsd.service)
 	@$(call install_replace, gpsd, \
diff --git a/scripts/migrate/migrate_ptx b/scripts/migrate/migrate_ptx
index 34c9a5ccedf8..484715cfeffe 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_SYSTEMD_UNIT -> GPSD_SYSTEMD
+# reason : options were renamed / merged
+#
+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