aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Crispin <john@phrozen.org>2016-10-22 22:13:06 +0200
committerJohn Crispin <john@phrozen.org>2016-10-26 12:37:40 +0200
commit7b9ac39afa48a4ffd9858c43d93106771447aa0b (patch)
treefe816ca0d442da4f49850b685a0a6a0bc0c23be0
parent5481ce9a1157a43d8b2c963e03fb243e70974361 (diff)
downloadupstream-7b9ac39afa48a4ffd9858c43d93106771447aa0b.tar.gz
upstream-7b9ac39afa48a4ffd9858c43d93106771447aa0b.tar.bz2
upstream-7b9ac39afa48a4ffd9858c43d93106771447aa0b.zip
ugps: update to latest git HEAD
* fixes a few error that uClibc users were seeing * add switch to disable time adjustment Signed-off-by: John Crispin <john@phrozen.org>
-rw-r--r--package/utils/ugps/Makefile4
-rw-r--r--package/utils/ugps/files/gps.config1
-rw-r--r--package/utils/ugps/files/ugps.init2
3 files changed, 5 insertions, 2 deletions
diff --git a/package/utils/ugps/Makefile b/package/utils/ugps/Makefile
index 2a54adfd7c..e85f9326c4 100644
--- a/package/utils/ugps/Makefile
+++ b/package/utils/ugps/Makefile
@@ -8,13 +8,13 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=ugps
-PKG_VERSION:=2016-09-05
+PKG_VERSION:=2016-10-24
PKG_RELEASE=$(PKG_SOURCE_VERSION)
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE_URL=$(LEDE_GIT)/project/ugps.git
PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=51b808cdd323c802847885421dd18897afaae210
+PKG_SOURCE_VERSION:=32a6b2b702c3b9f8c425f3d9dc9f4273e276029c
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
PKG_MIRROR_MD5SUM:=a353c722c3fe490dec1b6180c215e6a1d502e843c780dd97d556d1b346e8fa49
diff --git a/package/utils/ugps/files/gps.config b/package/utils/ugps/files/gps.config
index d997a590ce..eb00d79c60 100644
--- a/package/utils/ugps/files/gps.config
+++ b/package/utils/ugps/files/gps.config
@@ -1,2 +1,3 @@
config gps
option 'tty' 'ttyACM0'
+ option 'adjust_time ' '1'
diff --git a/package/utils/ugps/files/ugps.init b/package/utils/ugps/files/ugps.init
index 621d017869..a7a88c2258 100644
--- a/package/utils/ugps/files/ugps.init
+++ b/package/utils/ugps/files/ugps.init
@@ -12,11 +12,13 @@ service_triggers() {
start_service() {
local tty="$(uci get gps.@gps[-1].tty)"
+ local atime="$(uci get gps.@gps[-1].adjust_time)"
[ -d "/sys/class/tty/$tty/" ] || return
procd_open_instance
procd_set_param command "$PROG" "/dev/$tty"
+ [ "$atime" -eq 0 ] || procd_append_param command "-a"
procd_set_param respawn
procd_close_instance
}