From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Sat, 6 Oct 2007 23:54:18 +0000 (+0000)
Subject: gpsd: Cleanup startup script.
X-Git-Tag: Release-2010-05/1~8549^2~1^2~140^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c838676d5f07387ad3138824804c315fa5e5765;p=openembedded.git

gpsd: Cleanup startup script.
* gpsd configuration is done via mandatory /etc/defaults/gpsd, remove
confusing defaults from init script.
* Make error reporting more helpful.
* Based on complaints by forum users.
---

diff --git a/packages/gpsd/files/gpsd b/packages/gpsd/files/gpsd
index 2cf26c5f3a..3a14867f8a 100755
--- a/packages/gpsd/files/gpsd
+++ b/packages/gpsd/files/gpsd
@@ -6,10 +6,6 @@
 # description: Gpsd manages access to a serial- or USB-connected GPS
 # processname: gpsd
 
-# If you must specify a non-NMEA driver, uncomment and modify the next line
-#GPSD_OPTS=
-GPS_DEV="/dev/ttyS3"
-
 # Source function library.
 #. /etc/rc.d/init.d/functions
 
@@ -39,7 +35,7 @@ start() {
 	     echo "success"
 	else
 	    # User needs to symlink ${GPS_DEV} to the right thing
-	    echo "No ${GPS_DEV} device, aborting gpsd startup."
+	    echo "No ${GPS_DEV} GPS device, aborting gpsd startup. Check /etc/default/$prog"
 	fi
 	RETVAL=$?
 	echo
diff --git a/packages/gpsd/gpsd_2.28.bb b/packages/gpsd/gpsd_2.28.bb
index d51d088807..c16de2e951 100644
--- a/packages/gpsd/gpsd_2.28.bb
+++ b/packages/gpsd/gpsd_2.28.bb
@@ -1,2 +1,2 @@
 require gpsd.inc
-PR = "r3"
+PR = "r4"
diff --git a/packages/gpsd/gpsd_2.34.bb b/packages/gpsd/gpsd_2.34.bb
index 1399dba53b..32cb4b925d 100644
--- a/packages/gpsd/gpsd_2.34.bb
+++ b/packages/gpsd/gpsd_2.34.bb
@@ -1,4 +1,4 @@
 require gpsd.inc
 
-PR = "r4"
+PR = "r5"