From 52ab5cbc5b69f346c3960007ea9be393e855dc1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Mon, 5 Sep 2016 10:13:17 +0200 Subject: [PATCH] dump1090: update to latest version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also switches HTTP to uhttpd. Signed-off-by: Álvaro Fernández Rojas --- utils/dump1090/Makefile | 11 +++++++---- utils/dump1090/files/dump1090.config | 7 +++---- utils/dump1090/files/dump1090.default | 16 ++++++++++++++++ utils/dump1090/files/dump1090.init | 15 ++++++++------- 4 files changed, 34 insertions(+), 15 deletions(-) create mode 100644 utils/dump1090/files/dump1090.default diff --git a/utils/dump1090/Makefile b/utils/dump1090/Makefile index bed32bae7..62b38aeff 100644 --- a/utils/dump1090/Makefile +++ b/utils/dump1090/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dump1090 -PKG_VERSION:=2016-06-16 +PKG_VERSION:=2016-08-29 PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=git://github.com/mutability/dump1090.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=dfe3d7af12d0d739a1164c71086d4b37f57886d9 +PKG_SOURCE_VERSION:=08fba4e3b03ec5f7c0abcc339cba249cabfa16cd PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_MAINTAINER:=Álvaro Fernández Rojas @@ -36,7 +36,7 @@ endef define Package/dump1090 $(call Package/dump1090/Default) TITLE+= (dump1090) - DEPENDS+= +librtlsdr + DEPENDS+= +librtlsdr +uhttpd endef define Package/view1090 @@ -54,15 +54,18 @@ endef MAKE_FLAGS += \ CFLAGS="$(TARGET_CFLAGS)" \ - UNAME=Linux + UNAME="Linux" define Package/dump1090/install $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) files/dump1090.init $(1)/etc/init.d/dump1090 $(INSTALL_DIR) $(1)/etc/config $(INSTALL_CONF) files/dump1090.config $(1)/etc/config/dump1090 + $(INSTALL_DIR) $(1)/etc/uci-defaults + $(INSTALL_DATA) files/dump1090.default $(1)/etc/uci-defaults/00_uhttpd_dump1090 $(INSTALL_DIR) $(1)/usr/share/dump1090 $(CP) $(PKG_BUILD_DIR)/public_html/* $(1)/usr/share/dump1090 + $(LN) /var/run/dump1090 $(1)/usr/share/dump1090/data $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_BIN) $(PKG_BUILD_DIR)/dump1090 $(1)/usr/bin endef diff --git a/utils/dump1090/files/dump1090.config b/utils/dump1090/files/dump1090.config index 5854cb456..2b9e96a88 100644 --- a/utils/dump1090/files/dump1090.config +++ b/utils/dump1090/files/dump1090.config @@ -13,7 +13,6 @@ config dump1090 main option modeac '0' option net_only '0' option net_bind_address '' - option net_http_port '8080' option net_ri_port '' option net_ro_port '' option net_sbs_port '' @@ -38,13 +37,13 @@ config dump1090 main option stats_every '' option onlyaddr '0' option metric '0' - option hae '0' + option gnss '0' option snip '' option debug '' option ppm '' option html_dir '/usr/share/dump1090' - option write_json '' - option write_json_every '' + option write_json '/var/run/dump1090' + option write_json_every '1' option json_location_accuracy '' option oversample '0' option dcfilter '0' diff --git a/utils/dump1090/files/dump1090.default b/utils/dump1090/files/dump1090.default new file mode 100644 index 000000000..8df01a6c3 --- /dev/null +++ b/utils/dump1090/files/dump1090.default @@ -0,0 +1,16 @@ +#!/bin/sh +uci batch <<-EOF + set uhttpd.xupnpd=uhttpd + set uhttpd.xupnpd.listen_http='0.0.0.0:8080 [::]:8080' + set uhttpd.xupnpd.home=/usr/share/dump1090 + set uhttpd.xupnpd.rfc1918_filter=1 + set uhttpd.xupnpd.max_requests=3 + set uhttpd.xupnpd.max_connections=100 + set uhttpd.xupnpd.script_timeout=60 + set uhttpd.xupnpd.network_timeout=30 + set uhttpd.xupnpd.http_keepalive=20 + set uhttpd.xupnpd.tcp_keepalive=1 + set uhttpd.xupnpd.index_page='index.html index.htm gmap.html' + commit uhttpd +EOF +exit 0 diff --git a/utils/dump1090/files/dump1090.init b/utils/dump1090/files/dump1090.init index fead29edb..d57a2e198 100644 --- a/utils/dump1090/files/dump1090.init +++ b/utils/dump1090/files/dump1090.init @@ -1,5 +1,5 @@ #!/bin/sh /etc/rc.common -# Copyright (C) 2014-2015 OpenWrt.org +# Copyright (C) 2014-2016 OpenWrt.org START=90 STOP=10 @@ -51,7 +51,6 @@ start_instance() { append_bool "$cfg" modeac "--modeac" append_bool "$cfg" net_only "--net-only" append_arg "$cfg" net_bind_address "--net-bind-address" - append_arg "$cfg" net_http_port "--net-http-port" append_arg "$cfg" net_ri_port "--net-ri-port" append_arg "$cfg" net_ro_port "--net-ro-port" append_arg "$cfg" net_sbs_port "--net-sbs-port" @@ -76,13 +75,15 @@ start_instance() { append_arg "$cfg" stats_every "--stats-every" append_bool "$cfg" onlyaddr "--onlyaddr" append_bool "$cfg" metric "--metric" - append_bool "$cfg" hae "--hae" + append_bool "$cfg" gnss "--gnss" append_arg "$cfg" snip "--snip" append_arg "$cfg" debug "--debug" append_arg "$cfg" ppm "--ppm" append_arg "$cfg" html_dir "--html-dir" append_arg "$cfg" write_json "--write-json" - append_arg "$cfg" write_json_every "write-json-every" + config_get aux "$cfg" "write_json" + [ -n "$aux" ] && mkdir -p $aux + append_arg "$cfg" write_json_every "--write-json-every" append_arg "$cfg" json_location_accuracy "--json-location-accuracy" append_bool "$cfg" oversample "--oversample" append_bool "$cfg" dcfilter "--dcfilter" @@ -94,9 +95,9 @@ start_instance() { procd_close_instance } -service_triggers() { - procd_add_reload_trigger "dump1090" -} +service_triggers() { + procd_add_reload_trigger "dump1090" +} start_service() { config_load dump1090