From 926c514d23d110cb103c1bb6d76a97a6618e2b2c Mon Sep 17 00:00:00 2001
From: Alexandre Bard <alexandre.bard@netmodule.com>
Date: Tue, 9 Jul 2019 09:39:12 +0200
Subject: [PATCH] gpsd: Clean recipe and add support for HW23

BugzID: 57871
---
 recipes-connectivity/gpsd/gpsd/gpsd.service  | 10 ----------
 recipes-connectivity/gpsd/gpsd_3.17.bbappend |  7 ++-----
 2 files changed, 2 insertions(+), 15 deletions(-)
 delete mode 100644 recipes-connectivity/gpsd/gpsd/gpsd.service

diff --git a/recipes-connectivity/gpsd/gpsd/gpsd.service b/recipes-connectivity/gpsd/gpsd/gpsd.service
deleted file mode 100644
index b1055c8..0000000
--- a/recipes-connectivity/gpsd/gpsd/gpsd.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=GPS (Global Positioning System) Daemon
-Requires=gpsd.socket
-
-[Service]
-EnvironmentFile=/etc/default/gpsd
-ExecStart=/usr/sbin/gpsd /dev/ttyS3
-
-[Install]
-Also=gpsd.socket
diff --git a/recipes-connectivity/gpsd/gpsd_3.17.bbappend b/recipes-connectivity/gpsd/gpsd_3.17.bbappend
index 64d157f..8b231de 100644
--- a/recipes-connectivity/gpsd/gpsd_3.17.bbappend
+++ b/recipes-connectivity/gpsd/gpsd_3.17.bbappend
@@ -1,7 +1,3 @@
-FILESEXTRAPATHS_prepend_am335x-nrhw20 := "${THISDIR}/${PN}:"
-FILESEXTRAPATHS_prepend_am335x-nmhw21 := "${THISDIR}/${PN}:" 
-
-
 SRC_URI =+ "git://git.netmodule.intranet/nmsw/gpsd.git;protocol=ssh;user=gitea;branch=imu-integration"
 SRC_URI_remove = "http://download.savannah.gnu.org/releases/gpsd/gpsd-3.17.tar.gz"
 
@@ -10,10 +6,11 @@ SRCREV = "${AUTOREV}"
 S = "${WORKDIR}/git"
 
 TTY_DEVICE = "/dev/ttyS3"
+TTY_DEVICE_imx8-nmhw23 = "/dev/ttyACM0"
+
 USBAUTO_STATE = "false"
 
 do_install_append () {
-	#install -m 0644 ${WORKDIR}/${BPN}.service ${D}${systemd_unitdir}/system/${BPN}.service
 	sed -i 's|DEVICES=""|DEVICES="${TTY_DEVICE}"|g' ${D}/etc/default/gpsd.default
 	sed -i 's|USBAUTO="true"|USBAUTO="${USBAUTO_STATE}"|g' ${D}/etc/default/gpsd.default 
 }