merge of '49c84354677555417bff9c94bd9bb6ada73a166c'

     and 'daf2e2e41b4cfe60e4b4b29f0e7b8ad83261bff3'

3 files changed, 57 insertions, 4 deletions

diff --git a/packages/freesmartphone/fso-gpsd/.mtn2git_empty b/packages/freesmartphone/fso-gpsd/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/freesmartphone/fso-gpsd/.mtn2git_empty
diff --git a/packages/freesmartphone/fso-gpsd/fso-gpsd b/packages/freesmartphone/fso-gpsd/fso-gpsd
new file mode 100644
index 0000000000..9859c6f30b
--- /dev/null
+++ b/packages/freesmartphone/fso-gpsd/fso-gpsd
@@ -0,0 +1,40 @@
+#! /bin/sh
+#
+# fso-gpsd -- This shell script starts and stops the freemsmartphone.org gpsd compatibility daemon
+#
+# chkconfig: 345 70 30
+# description: fso-gpsd is the freesmartphone.org gpsd compatibility daemon
+# processname: fso-gpsd
+
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+NAME=fso-gpsd
+
+[ -f /etc/default/rcS ] && . /etc/default/rcS
+
+case "$1" in
+    start)
+        echo -n "Starting freesmartphone.org gpsd compatibility daemon: "
+        start-stop-daemon --start --pidfile /var/run/${NAME}.pid --make-pidfile -x /usr/sbin/fso-gpsd
+        if [ $? = 0 ]; then
+            echo "(ok)"
+        else
+            echo "(failed)"
+        fi
+        ;;
+    stop)
+        echo -n "Stopping freesmartphone.org gpsd compatibility daemon: "
+        start-stop-daemon --stop --pidfile /var/run/${NAME}.pid --oknodo
+        rm -f /var/run/${NAME}.pid
+        echo "(done)"
+        ;;
+    restart|force-reload)
+        $0 stop
+        $0 start
+        ;;
+    *)
+        echo "Usage: /etc/init.d/fso-gpsd {start|stop|restart|force-reload}"
+        exit 1
+        ;;
+esac
+
+exit 0
diff --git a/packages/freesmartphone/fso-gpsd_git.bb b/packages/freesmartphone/fso-gpsd_git.bb
index 85cb5194b5..4382038c64 100644
--- a/packages/freesmartphone/fso-gpsd_git.bb
+++ b/packages/freesmartphone/fso-gpsd_git.bb
@@ -1,15 +1,28 @@
-DESCRIPTION = "gspd compatibility layer for frameworkd"
+DESCRIPTION = "freesmartphone.org gpsd compatibility daemon"
 LICENSE = "GPL"
 SECTION = "network"
 DEPENDS = "dbus-glib"
 PV = "0.6+${PR}+gitr${SRCREV}"
-PR = "r0"
+PR = "r1"
 
-SRC_URI = "${FREESMARTPHONE_GIT}/fso-gpsd.git;protocol=git;branch=master"
+SRC_URI = "\
+  ${FREESMARTPHONE_GIT}/fso-gpsd.git;protocol=git;branch=master \
+  file://fso-gpsd \
+"
 S = "${WORKDIR}/git"
 
-inherit autotools
+inherit autotools update-rc.d
 
+INITSCRIPT_NAME = "gpsd"
+INITSCRIPT_PARAMS = "defaults 35"
+
+do_install_append() {
+    install -d ${D}${sysconfdir}/init.d/
+    install -m 0755 ${WORKDIR}/fso-gpsd ${D}${sysconfdir}/init.d/
+}
+
+FILES_${PN} += "${sysconfdir}"
+RDEPENDS_${PN} = "frameworkd"
 RPROVIDES_${PN} = "gpsd"
 RCONFLICTS_${PN} = "gpsd"
 RREPLACES_${PN} = "gpsd"