diff options
-rw-r--r-- | meta-oe/recipes-navigation/gpsd/gpsd/60-gpsd.rules | 47 | ||||
-rwxr-xr-x | meta-oe/recipes-navigation/gpsd/gpsd/gpsd | 136 | ||||
-rw-r--r-- | meta-oe/recipes-navigation/gpsd/gpsd/gpsd-default | 5 | ||||
-rw-r--r-- | meta-oe/recipes-navigation/gpsd/gpsd/gpsd.service | 10 | ||||
-rw-r--r-- | meta-oe/recipes-navigation/gpsd/gpsd_3.16.bb | 12 |
5 files changed, 4 insertions, 206 deletions
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd/60-gpsd.rules b/meta-oe/recipes-navigation/gpsd/gpsd/60-gpsd.rules deleted file mode 100644 index 61143b8f6b..0000000000 --- a/meta-oe/recipes-navigation/gpsd/gpsd/60-gpsd.rules +++ /dev/null @@ -1,47 +0,0 @@ -# udev rules for gpsd -# $Id$ -# -# GPSes don't have their own USB device class. They're serial-over-USB -# devices, so what you see is actually the ID of the serial-over-USB chip. -# Fortunately, just two of these account for over 80% of consumer-grade -# GPS sensors. The gpsd.hotplug.wrapper script will tell a running gpsd -# that it should look at the device that just went active, because it -# might be a GPS. -# -# The following setup works on Debian - something similar will apply on -# other distributions: -# -# /etc/udev/gpsd.rules -# /etc/udev/rules.d/025_gpsd.rules -> ../gpsd.rules -# /lib/udev/gpsd.hotplug.wrapper -# /lib/udev/gpsd.hotplug -# -# Setting the link in /etc/udev/rules.d activates the rule and determines -# when to run it on boot (similar to init.d processing). - -SUBSYSTEM!="tty", GOTO="gpsd_rules_end" - -# Prolific Technology, Inc. PL2303 Serial Port -ATTR{idVendor}=="067b", ATTR{idProduct}=="2303", SYMLINK+="gps%n", RUN+="/lib/udev/gpsd.hotplug.wrapper" -# ATEN International Co., Ltd UC-232A Serial Port [pl2303] -ATTR{idVendor}=="0557", ATTR{idProduct}=="2008", SYMLINK+="gps%n", RUN+="/lib/udev/gpsd.hotplug.wrapper" -# FTDI 8U232AM -ATTR{idVendor}=="0403", ATTR{idProduct}=="6001", SYMLINK+="gps%n", RUN+="/lib/udev/gpsd.hotplug.wrapper" -# Cypress M8/CY7C64013 (DeLorme uses these) -ATTR{idVendor}=="1163", ATTR{idProduct}=="0100", SYMLINK+="gps%n", RUN+="/lib/udev/gpsd.hotplug.wrapper" -# PS-360 OEM (Microsoft GPS sold with Street and Trips 2005) -ATTR{idVendor}=="067b", ATTR{idProduct}=="aaa0", SYMLINK+="gps%n", RUN+="/lib/udev/gpsd.hotplug.wrapper" -# Garmin International GPSmap, various models (tested with Garmin GPS 18 USB) -ATTR{idVendor}=="091e", ATTR{idProduct}=="0003", SYMLINK+="gps%n", RUN+="/lib/udev/gpsd.hotplug.wrapper" -# Cygnal Integrated Products, Inc. CP210x Composite Device (Used by Holux m241) -ATTR{idVendor}=="10c4", ATTR{idProduct}=="ea60", SYMLINK+="gps%n", RUN+="/lib/udev/gpsd.hotplug.wrapper" -# u-blox AG, u-blox 5 (tested with Navilock NL-402U) -ATTR{idVendor}=="1546", ATTR{idProduct}=="01a5", SYMLINK="gps%n", RUN+="/lib/udev/gpsd.hotplug.wrapper" -# FTDI FT232 -ATTR{idVendor}=="0403", ATTR{idProduct}=="6001", SYMLINK="gps%n", RUN+="/lib/udev/gpsd.hotplug.wrapper" -# u-blox 4 -ATTR{idVendor}=="1546", ATTR{idProduct}=="01a4", SYMLINK="gps%n", RUN+="/lib/udev/gpsd.hotplug.wrapper" - -ACTION=="remove", RUN+="/lib/udev/gpsd.hotplug.wrapper" - -LABEL="gpsd_rules_end" diff --git a/meta-oe/recipes-navigation/gpsd/gpsd/gpsd b/meta-oe/recipes-navigation/gpsd/gpsd/gpsd deleted file mode 100755 index ba73dafb2c..0000000000 --- a/meta-oe/recipes-navigation/gpsd/gpsd/gpsd +++ /dev/null @@ -1,136 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: gpsd -# Required-Start: $remote_fs $network -# Should-Start: bluetooth dbus udev -# Required-Stop: $remote_fs $network -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: GPS (Global Positioning System) daemon start/stop script -# Description: Start/Stop script for the gpsd service daemon, -# which is able to monitor one or more GPS devices -# connected to a host computer, making all data on -# the location and movements of the sensors available -# to be queried on TCP port 2947. -### END INIT INFO - -# Author: Bernd Zeimetz <bzed@debian.org> -# -# Please remove the "Author" lines above and replace them -# with your own name if you copy and modify this script. - -# Do NOT "set -e" - -# PATH should only include /usr/* if it runs after the mountnfs.sh script -PATH=/sbin:/usr/sbin:/bin:/usr/bin -DESC="GPS (Global Positioning System) daemon" -NAME=gpsd -DAEMON=/usr/sbin/$NAME -PIDFILE=/var/run/$NAME.pid -SCRIPTNAME=/etc/init.d/$NAME - -# Exit if the package is not installed -[ -x "$DAEMON" ] || exit 0 - -# Read configuration, if present -[ -r /etc/default/$NAME ] && . /etc/default/$NAME - -if [ -z "$GPSD_SOCKET" ] && [ -z "$DEVICES" ]; then - GPSD_SOCKET=/var/run/gpsd.sock -fi - -if [ -n "$GPSD_SOCKET" ]; then - GPSD_OPTIONS="$GPSD_OPTIONS -F $GPSD_SOCKET" -fi - -# -# Function that starts the daemon/service -# -do_start() -{ - # Return - # 0 if daemon has been started - # 1 if daemon was already running - # 2 if daemon could not be started - start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test \ - -- $GPSD_OPTIONS -P $PIDFILE $GPS_DEVICES > /dev/null \ - || return 1 - start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \ - $GPSD_OPTIONS -P $PIDFILE $GPS_DEVICES \ - || return 2 -} - -# -# Function that stops the daemon/service -# -do_stop() -{ - # Return - # 0 if daemon has been stopped - # 1 if daemon was already stopped - # 2 if daemon could not be stopped - # other if a failure occurred - start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME - RETVAL="$?" - [ "$RETVAL" = 2 ] && return 2 - # Many daemons don't delete their pidfiles when they exit. - rm -f $PIDFILE - return "$RETVAL" -} - -# -# Function that sends a SIGHUP to the daemon/service -# -do_reload() { - # - # If the daemon can reload its configuration without - # restarting (for example, when it is sent a SIGHUP), - # then implement that here. - # - start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME - return 0 -} - -case "$1" in - start) - echo "Starting $DESC" "$NAME" - do_start - exit $? - ;; - stop) - echo "Stopping $DESC" "$NAME" - do_stop - exit $? - ;; - status) - ;; - reload|force-reload) - echo "Reloading $DESC" "$NAME" - do_reload - exit $? - ;; - restart) - # - # If the "reload" option is implemented then remove the - # 'force-reload' alias - # - echo "Restarting $DESC" "$NAME" - do_stop - case "$?" in - 0|1) - do_start - exit $? - ;; - *) - # Failed to stop - exit 1 - ;; - esac - ;; - *) - echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 - exit 3 - ;; -esac - -: diff --git a/meta-oe/recipes-navigation/gpsd/gpsd/gpsd-default b/meta-oe/recipes-navigation/gpsd/gpsd/gpsd-default deleted file mode 100644 index 0ceff03824..0000000000 --- a/meta-oe/recipes-navigation/gpsd/gpsd/gpsd-default +++ /dev/null @@ -1,5 +0,0 @@ -# If you must specify a non-NMEA driver, uncomment and modify the next line -GPSD_SOCKET="/var/run/gpsd.sock" -GPSD_OPTIONS="" -GPS_DEVICES="" - 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 7131a589d7..0000000000 --- a/meta-oe/recipes-navigation/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 -N $GPS_DEVICES - -[Install] -Also=gpsd.socket diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_3.16.bb b/meta-oe/recipes-navigation/gpsd/gpsd_3.16.bb index 26d74867bf..4c2e328e8a 100644 --- a/meta-oe/recipes-navigation/gpsd/gpsd_3.16.bb +++ b/meta-oe/recipes-navigation/gpsd/gpsd_3.16.bb @@ -11,10 +11,6 @@ SRC_URI = "${SAVANNAH_GNU_MIRROR}/${BPN}/${BP}.tar.gz \ file://0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch \ file://0004-SConstruct-disable-html-and-man-docs-building-becaus.patch \ file://0001-include-sys-ttydefaults.h.patch \ - file://gpsd-default \ - file://gpsd \ - file://60-gpsd.rules \ - file://gpsd.service \ " SRC_URI[md5sum] = "68691b5de4c94f82ec4062b042b5eb63" SRC_URI[sha256sum] = "03579af13a4d3fe0c5b79fa44b5f75c9f3cac6749357f1d99ce5d38c09bc2029" @@ -67,13 +63,13 @@ do_install() { do_install_append() { install -d ${D}/${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/gpsd ${D}/${sysconfdir}/init.d/ + install -m 0755 ${S}/packaging/deb/etc_init.d_gpsd ${D}/${sysconfdir}/init.d/gpsd install -d ${D}/${sysconfdir}/default - install -m 0644 ${WORKDIR}/gpsd-default ${D}/${sysconfdir}/default/gpsd.default + install -m 0644 ${S}/packaging/deb/etc_default_gpsd ${D}/${sysconfdir}/default/gpsd.default #support for udev install -d ${D}/${sysconfdir}/udev/rules.d - install -m 0644 ${WORKDIR}/60-gpsd.rules ${D}/${sysconfdir}/udev/rules.d + install -m 0644 ${S}/gpsd.rules ${D}/${sysconfdir}/udev/rules.d/ install -d ${D}${base_libdir}/udev/ install -m 0755 ${S}/gpsd.hotplug ${D}${base_libdir}/udev/ @@ -83,7 +79,7 @@ do_install_append() { #support for systemd install -d ${D}${systemd_unitdir}/system/ - install -m 0644 ${WORKDIR}/${BPN}.service ${D}${systemd_unitdir}/system/${BPN}.service + install -m 0644 ${S}/systemd/${BPN}.service ${D}${systemd_unitdir}/system/${BPN}.service install -m 0644 ${S}/systemd/${BPN}.socket ${D}${systemd_unitdir}/system/${BPN}.socket } |