From c09342fd6cc4644eb8114bdd2f004856c8546d50 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Tue, 24 Apr 2012 17:43:35 +0200
Subject: [PATCH] gpsd: use gpsd.service and gpsd.socket from source tree, drop
 local files

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-navigation/gpsd/gpsd/gpsd.service | 9 ---------
 meta-oe/recipes-navigation/gpsd/gpsd/gpsd.socket  | 9 ---------
 meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb       | 7 +++++--
 3 files changed, 5 insertions(+), 20 deletions(-)
 delete mode 100644 meta-oe/recipes-navigation/gpsd/gpsd/gpsd.service
 delete mode 100644 meta-oe/recipes-navigation/gpsd/gpsd/gpsd.socket

diff --git a/meta-oe/recipes-navigation/gpsd/gpsd/gpsd.service b/meta-oe/recipes-navigation/gpsd/gpsd/gpsd.service
deleted file mode 100644
index 8deaf759a7..0000000000
--- a/meta-oe/recipes-navigation/gpsd/gpsd/gpsd.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=GPS (Global Positioning System) Daemon
-Requires=gpsd.socket
-
-[Service]
-ExecStart=/usr/sbin/gpsd -N
-
-[Install]
-Also=gpsd.socket
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd/gpsd.socket b/meta-oe/recipes-navigation/gpsd/gpsd/gpsd.socket
deleted file mode 100644
index 13c17f2480..0000000000
--- a/meta-oe/recipes-navigation/gpsd/gpsd/gpsd.socket
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=GPS (Global Positioning System) Daemon Sockets
-
-[Socket]
-ListenStream=/var/run/gpsd.sock
-ListenStream=127.0.0.1:2947
-
-[Install]
-WantedBy=sockets.target
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb b/meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb
index 37fb79d10d..d139091fdc 100644
--- a/meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb
+++ b/meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb
@@ -11,8 +11,6 @@ SRC_URI = "http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz \
   file://0002-SConstruct-respect-sysroot-also-in-SPLINTOPTS.patch \
   file://gpsd-default \
   file://gpsd \
-  file://gpsd.socket \
-  file://gpsd.service \
   file://60-gpsd.rules \
 "
 SRC_URI[md5sum] = "c01353459faa68834309109d4e868460"
@@ -72,6 +70,11 @@ do_install_append() {
     #support for python
     install -d ${D}/${PYTHON_SITEPACKAGES_DIR}/gps
     install -m 755 ${S}/gps/*.py ${D}/${PYTHON_SITEPACKAGES_DIR}/gps
+
+    #support for systemd
+    install -d ${D}${systemd_unitdir}/system/
+    install -m 0644 ${S}/systemd/${PN}.service ${D}${systemd_unitdir}/system/${PN}.service
+    install -m 0644 ${S}/systemd/${PN}.socket ${D}${systemd_unitdir}/system/${PN}.socket
 }
 
 pkg_postinst_${PN}-conf() {