diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-25 14:01:11 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-25 14:01:11 +0200 |
| commit | c94bf77ede06fa67fd3222ffa3fcad8898e1fd59 (patch) | |
| tree | 3e4cc7f273a07c12fd69c589da434717e523664f /extra/gpsd | |
| parent | 0f89996e6f908cc405cd44478860b864dcb189f1 (diff) | |
| parent | 3b99c42eb8ca744e86e4e17197b1bf10642c6785 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/nginx/PKGBUILD
community-testing/nginx/nginx.install
community/chrony/PKGBUILD
community/lxdm/PKGBUILD
community/oidentd/PKGBUILD
community/oss/PKGBUILD
community/pdnsd/PKGBUILD
community/ruby-cairo/PKGBUILD
community/subtle/PKGBUILD
core/kmod/PKGBUILD
core/lvm2/PKGBUILD
core/openldap/PKGBUILD
core/systemd/PKGBUILD
extra/smartmontools/PKGBUILD
multilib/wine/PKGBUILD
Diffstat (limited to 'extra/gpsd')
| -rw-r--r-- | extra/gpsd/PKGBUILD | 13 | ||||
| -rwxr-xr-x | extra/gpsd/gpsd | 9 | ||||
| -rw-r--r-- | extra/gpsd/gpsd.install | 5 |
3 files changed, 12 insertions, 15 deletions
diff --git a/extra/gpsd/PKGBUILD b/extra/gpsd/PKGBUILD index de4cf0cf9..d11fcc7f4 100644 --- a/extra/gpsd/PKGBUILD +++ b/extra/gpsd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 157357 2012-04-27 21:14:32Z tomegun $ +# $Id: PKGBUILD 162159 2012-06-22 12:58:34Z dreisner $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Giacomo Rizzo <alt@free-os.it> pkgname=gpsd -pkgver=3.5 +pkgver=3.6 pkgrel=1 pkgdesc="GPS daemon and library to support USB/serial GPS devices" arch=('i686' 'x86_64' 'mips64el') @@ -72,9 +72,12 @@ package() { install -D -m755 "${srcdir}/gpsd" "${pkgdir}/etc/rc.d/gpsd" + install -D -m644 systemd/gpsd.service "${pkgdir}/usr/lib/systemd/system/gpsd.service" + install -D -m644 systemd/gpsd.socket "${pkgdir}/usr/lib/systemd/system/gpsd.socket" + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } -md5sums=('e96881798a0ab67aa3cd5f3249f0e536' - 'f6b3718b205be7853d49bae6ef587853' - '1f3402f8e33a7032b9ae6dfd077234f7' +md5sums=('064a5ad75593f8c3ea3fe85010647832' + '6473da46f6bad52d38f88670f84cd92b' + '6602d04bb037bc500424f00f24f58837' '3e963df3f9f7ef3572ecc648ae829315') diff --git a/extra/gpsd/gpsd b/extra/gpsd/gpsd index b510a7542..2ca7efe26 100755 --- a/extra/gpsd/gpsd +++ b/extra/gpsd/gpsd @@ -5,15 +5,14 @@ [ -f /etc/conf.d/gpsd ] && . /etc/conf.d/gpsd NAME=gpsd -DAEMON=/usr/sbin/$NAME -PIDFILE=/var/run/$NAME/$NAME.pid +DAEMON=/usr/sbin/gpsd +PIDFILE=/run/gpsd.pid PID=$(cat $PIDFILE 2>/dev/null) case "$1" in start) - stat_busy "Starting $NAME" - [ ! -d /var/run/$NAME ] && install -d /var/run/$NAME - [ -z "$PID" ] && "$DAEMON" -P $PIDFILE -F /var/run/$NAME/$NAME.sock ${GPSD_OPTIONS} ${DEVICES} + stat_busy "Starting gpsd" + [ -z "$PID" ] && "$DAEMON" -P $PIDFILE -F /run/gpsd.sock ${GPSD_OPTIONS} ${DEVICES} if [ $? -gt 0 ]; then stat_fail else diff --git a/extra/gpsd/gpsd.install b/extra/gpsd/gpsd.install index ee661fcb1..8f20cf484 100644 --- a/extra/gpsd/gpsd.install +++ b/extra/gpsd/gpsd.install @@ -1,9 +1,4 @@ post_install() { - echo ">>> Note: the supplied gpsd udev rules are device-specific, so" - echo ">>> if your device isn't detected correctly, please use lsusb or" - echo ">>> another suitable tool to determine the proper device IDs and" - echo ">>> use the commented rules to fill in the blanks for your device." - update-desktop-database -q } |