diff options
| author | Holger Hans Peter Freyther <zecke@selfish.org> | 2008-11-16 17:01:27 +0100 |
|---|---|---|
| committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2008-11-16 17:01:27 +0100 |
| commit | bebdfc4fc782d32f7192a9fa707408fdd133cfd5 (patch) | |
| tree | 369d2a7426fd93e026a6407b7b5307562c056a94 /packages/gpsd | |
| parent | 4cf709283530b333f18ca3530241dd0b73241b1f (diff) | |
| parent | b8bb4647b43017e32788b7575bad70b77e11ab1b (diff) | |
Merge branch 'holger/openmoko-merges' into org.openembedded.dev
Diffstat (limited to 'packages/gpsd')
| -rwxr-xr-x | packages/gpsd/files/gpsd | 21 | ||||
| -rw-r--r-- | packages/gpsd/files/om-gta02/gpsd-default | 3 | ||||
| -rw-r--r-- | packages/gpsd/gpsd_2.34.bb | 2 |
3 files changed, 9 insertions, 17 deletions
diff --git a/packages/gpsd/files/gpsd b/packages/gpsd/files/gpsd index e536837e1c..91f09c1b75 100755 --- a/packages/gpsd/files/gpsd +++ b/packages/gpsd/files/gpsd @@ -10,6 +10,7 @@ #. /etc/rc.d/init.d/functions RETVAL=0 +DAEMON=/usr/sbin/gpsd prog="gpsd" test -f /etc/default/$prog && . /etc/default/$prog @@ -40,29 +41,24 @@ start() { if [ -e "${GPS_DEV}" ] then - gpsd ${GPSD_OPTS} ${GPS_DEV} - echo "success" + start-stop-daemon -S -x ${DAEMON} -- ${GPSD_OPTS} ${GPS_DEV} + echo "success" else # User needs to symlink ${GPS_DEV} to the right thing echo "No ${GPS_DEV} GPS device, aborting gpsd startup. Check /etc/default/$prog" fi RETVAL=$? echo - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/gpsd return $RETVAL } stop() { # Stop daemons. echo -n "Shutting down $prog: " - killall gpsd + start-stop-daemon -K -x ${DAEMON} # killproc gpsd RETVAL=$? echo - if [ $RETVAL -eq 0 ] - then - rm -f /var/lock/subsys/gpsd; - fi return $RETVAL } @@ -79,19 +75,12 @@ case "$1" in start RETVAL=$? ;; - condrestart) - if [ -f /var/lock/subsys/gpsd ]; then - stop - start - RETVAL=$? - fi - ;; status) # status gpsd # RETVAL=$? ;; *) - echo "Usage: $0 {start|stop|restart|condrestart|status}" + echo "Usage: $0 {start|stop|restart|status}" exit 1 esac diff --git a/packages/gpsd/files/om-gta02/gpsd-default b/packages/gpsd/files/om-gta02/gpsd-default new file mode 100644 index 0000000000..be43103412 --- /dev/null +++ b/packages/gpsd/files/om-gta02/gpsd-default @@ -0,0 +1,3 @@ +# If you must specify a non-NMEA driver, uncomment and modify the next line +#GPSD_OPTS= +GPS_DEV="/dev/ttySAC1" diff --git a/packages/gpsd/gpsd_2.34.bb b/packages/gpsd/gpsd_2.34.bb index 8e46cb01eb..4f4e3a3a78 100644 --- a/packages/gpsd/gpsd_2.34.bb +++ b/packages/gpsd/gpsd_2.34.bb @@ -1,4 +1,4 @@ require gpsd.inc -PR = "r9" +PR = "r10" |