Signed-off-by: Ladislav Michl <la...@linux-mips.org>
---
Note, udev rules and sysv init script are left as an excercise
for respective users (I do not have hardware to test with) :)
...ice-files-to-match-installation-path.patch | 37 +++++++++++++++++++
patches/gpsd-3.19/series | 3 +-
projectroot/etc/default/gpsd | 5 +++
rules/gpsd.in | 6 +++
rules/gpsd.make | 14 +++++++
5 files changed, 64 insertions(+), 1 deletion(-)
create mode 100644
patches/gpsd-3.19/0003-Fix-systemd-service-files-to-match-installation-path.patch
create mode 100644 projectroot/etc/default/gpsd
diff --git
a/patches/gpsd-3.19/0003-Fix-systemd-service-files-to-match-installation-path.patch
b/patches/gpsd-3.19/0003-Fix-systemd-service-files-to-match-installation-path.patch
new file mode 100644
index 000000000..e88320b91
--- /dev/null
+++
b/patches/gpsd-3.19/0003-Fix-systemd-service-files-to-match-installation-path.patch
@@ -0,0 +1,37 @@
+From: Ladislav Michl <la...@linux-mips.org>
+Date: Fri, 6 Dec 2019 08:12:03 +0100
+Subject: [PATCH] Fix systemd service files to match installation path
+
+---
+ systemd/gpsd.service | 3 +--
+ systemd/gpsdctl@.service | 5 ++---
+ 2 files changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/systemd/gpsd.service b/systemd/gpsd.service
+index c1f193cc6942..6fa229561adf 100644
+--- a/systemd/gpsd.service
++++ b/systemd/gpsd.service
+@@ -7,8 +7,7 @@ After=chronyd.service
+ [Service]
+ Type=forking
+ EnvironmentFile=-/etc/default/gpsd
+-EnvironmentFile=-/etc/sysconfig/gpsd
+-ExecStart=/usr/local/sbin/gpsd $GPSD_OPTIONS $OPTIONS $DEVICES
++ExecStart=/usr/sbin/gpsd $GPSD_OPTIONS $DEVICES
+
+ [Install]
+ WantedBy=multi-user.target
+diff --git a/systemd/gpsdctl@.service b/systemd/gpsdctl@.service
+index 1c80101de340..58c5176defae 100644
+--- a/systemd/gpsdctl@.service
++++ b/systemd/gpsdctl@.service
+@@ -8,7 +8,6 @@ After=dev-%i.device
+ Type=oneshot
+ Environment="GPSD_SOCKET=/var/run/gpsd.sock"
+ EnvironmentFile=-/etc/default/gpsd
+-EnvironmentFile=-/etc/sysconfig/gpsd
+ RemainAfterExit=yes
+-ExecStart=/bin/sh -c "[ \"$USBAUTO\" = true ] && /usr/local/sbin/gpsdctl add
/dev/%I || :"
+-ExecStop=/bin/sh -c "[ \"$USBAUTO\" = true ] && /usr/local/sbin/gpsdctl
remove /dev/%I || :"
++ExecStart=/bin/sh -c "[ \"$USBAUTO\" = true ] && /usr/sbin/gpsdctl add
/dev/%I || :"
++ExecStop=/bin/sh -c "[ \"$USBAUTO\" = true ] && /usr/sbin/gpsdctl remove
/dev/%I || :"
diff --git a/patches/gpsd-3.19/series b/patches/gpsd-3.19/series
index 32349387e..9250c5aaf 100644
--- a/patches/gpsd-3.19/series
+++ b/patches/gpsd-3.19/series
@@ -2,4 +2,5 @@
#tag:base --start-number 1
0001-Search-for-ncursesw-pkgconfig.patch
0002-Fix-python-binding-cross-compilation.patch
-# a402ea49345e59dc5c9f5487c0ce65c6 - git-ptx-patches magic
+0003-Fix-systemd-service-files-to-match-installation-path.patch
+# 4ae3d41ecea44cc4df7cf9e46c50b850 - git-ptx-patches magic
diff --git a/projectroot/etc/default/gpsd b/projectroot/etc/default/gpsd
new file mode 100644
index 000000000..8a860598b
--- /dev/null
+++ b/projectroot/etc/default/gpsd
@@ -0,0 +1,5 @@
+# Devices gpsd should connect at boot time
+DEVICES=""
+
+# Other options passed to gpsd
+GPSD_OPTIONS=""
diff --git a/rules/gpsd.in b/rules/gpsd.in
index 660088969..aebf735d6 100644
--- a/rules/gpsd.in
+++ b/rules/gpsd.in
@@ -278,6 +278,12 @@ 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
+ bool
+ default y
+ depends on INITMETHOD_SYSTEMD && GPSD_GPSD
+ prompt "systemd unit files for gpsd"
+
config GPSD_GPS2UDP
bool
prompt "gps2udp"
diff --git a/rules/gpsd.make b/rules/gpsd.make
index ae4e0628e..a3a5c8ba4 100644
--- a/rules/gpsd.make
+++ b/rules/gpsd.make
@@ -151,6 +151,12 @@ ifneq ($(call remove_quotes,$(PTXCONF_GPSD_MAX_DEVICES)),)
GPSD_CONF_OPT += max_devices=$(PTXCONF_GPSD_MAX_DEVICES)
endif
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+GPSD_INSTALL_OPT := udev-install
+
# ----------------------------------------------------------------------------
# Target-Install
# ----------------------------------------------------------------------------
@@ -174,6 +180,14 @@ endif
ifdef PTXCONF_GPSD_PYTHON
@$(call install_glob, gpsd, 0, 0, -, \
/usr/lib/python$(PYTHON3_MAJORMINOR), *.so *.py)
+endif
+ifdef PTXCONF_GPSD_SYSTEMD_UNIT
+ @$(call install_alternative, gpsd, 0, 0, 644, /etc/default/gpsd)
+ @$(call install_alternative, gpsd, 0, 0, 644,
/lib/systemd/system/gpsdctl@.service)
+ @$(call install_alternative, gpsd, 0, 0, 644,
/lib/systemd/system/gpsd.service)
+ @$(call install_link, gpsd, ../gpsd.service, \
+ /lib/systemd/system/multi-user.target.wants/gpsd.service)
+ @$(call install_alternative, gpsd, 0, 0, 644,
/lib/systemd/system/gpsd.socket)
endif
@$(call install_finish, gpsd)
--
2.24.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
