From 33cf972ea6eccc75238ee47a9cb41129d3301f8b Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Fri, 20 Dec 2019 17:04:22 -0600
Subject: Correct new gpsd_settime script in case status is missing from
 gpspipe output

---
 recipes-navigation/gpsd/gpsd/gpsd_settime.sh | 2 +-
 recipes-navigation/gpsd/gpsd_3.16.bb         | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/recipes-navigation/gpsd/gpsd/gpsd_settime.sh b/recipes-navigation/gpsd/gpsd/gpsd_settime.sh
index 578013b..e8e8f26 100755
--- a/recipes-navigation/gpsd/gpsd/gpsd_settime.sh
+++ b/recipes-navigation/gpsd/gpsd/gpsd_settime.sh
@@ -63,7 +63,7 @@ fi
 ) &
         
 # Get the ISO8601 time from GPSD
-ISO8601=$(gpspipe -w | grep -m1  '{"class":"TPV","device":"/dev/gps0","status":.*,"time":"' | sed -e 's/.*,"time":"//' -e 's/Z",.*//')
+ISO8601=$(gpspipe -w | egrep -m1 '\{"class":"TPV","device":"/dev/gps0"(,"status":[0-9])*,"mode":3,"time":"' | sed -e 's/.*,"time":"//' -e 's/Z",.*//')
 
 if (( ${#ISO8601} > 18 )) ; then
   LG -p user.warn "Updating time to time, ${ISO8601}."
diff --git a/recipes-navigation/gpsd/gpsd_3.16.bb b/recipes-navigation/gpsd/gpsd_3.16.bb
index 2111399..704a928 100644
--- a/recipes-navigation/gpsd/gpsd_3.16.bb
+++ b/recipes-navigation/gpsd/gpsd_3.16.bb
@@ -4,7 +4,7 @@ LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d217a23f408e91c94359447735bc1800"
 DEPENDS = "dbus dbus-glib ncurses python libusb1 chrpath-replacement-native pps-tools"
 PROVIDES = "virtual/gpsd"
-PR="m13"
+PR="m14"
 
 EXTRANATIVEPATH += "chrpath-native"
 
@@ -21,6 +21,8 @@ SRC_URI = "${SAVANNAH_GNU_MIRROR}/${BPN}/${BP}.tar.gz \
     file://gpsd \
     file://gpsd_ubx_fixed.sh \
     file://gpsd_ubx_settime.sh \
+    file://gpsd_settime.sh \
+    file://gpsd_fixed.sh \
     file://gpsd.rules \
     file://gpsd.service \
 "
@@ -122,6 +124,8 @@ do_install_append() {
     install -d ${D}${sbindir}
     install -m 0755 ${WORKDIR}/gpsd_ubx_fixed.sh ${D}${sbindir}/gpsd_ubx_fixed
     install -m 0755 ${WORKDIR}/gpsd_ubx_settime.sh ${D}${sbindir}/gpsd_ubx_settime
+    install -m 0755 ${WORKDIR}/gpsd_fixed.sh ${D}${sbindir}/gpsd_fixed
+    install -m 0755 ${WORKDIR}/gpsd_settime.sh ${D}${sbindir}/gpsd_settime
 
     #support for udev
     install -d ${D}/${sysconfdir}/udev/rules.d
@@ -168,7 +172,7 @@ PACKAGES =+ "libgps libgpsd python-pygps-dbg python-pygps gpsd-udev gpsd-conf gp
 # FILES_${PN}-dev += "${libdir}/pkgconfdir/libgpsd.pc ${libdir}/pkgconfdir/libgps.pc \
 #                     ${includedir}/gps.h ${includedir}/libgpsmm.h ${includedir}/gps"
 
-FILES_${PN} += "${sbindir}/gpsd_ubx_fixed ${sbindir}/gpsd_ubx_settime"
+FILES_${PN} += "${sbindir}/gpsd_*"
 
 FILES_python-pygps-dbg += " ${libdir}/python*/site-packages/gps/.debug"
 
-- 
cgit v1.2.3