MS0NTR-Radio-Club
/
dump1090-fa
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update packaging to produce dump1090-flightaware & faup1090 packages.

This commit is contained in:
Oliver Jowett 2014-12-07 13:12:20 +00:00
parent 03211c5e16
commit 7867cb5aba
12 changed files with 45 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
debian/changelog vendored
View File

@ -1,20 +1,5 @@
dump1090-mr (1.08.2302.14+1-3) UNRELEASED; urgency=medium dump1090-flightaware (0.18+mu1-1) UNRELEASED; urgency=medium
* Remove spurious dependencies on net-tools * Initial release.
-- Oliver Jowett <oliver@mutability.co.uk> Sun, 07 Dec 2014 12:21:18 +0000 -- Oliver Jowett <oliver@mutability.co.uk> Sun, 07 Dec 2014 12:38:49 +0000
dump1090-mr (1.08.2302.14+1-2) unstable; urgency=medium
* Pass --name / --user to start-stop-daemon when starting
* Log to /var/log/dump1090-mr.log (configurable via LOGFILE)
* Log stats once an hour by default (configurable via STATS_INTERVAL)
* Include a logrotate configuration
-- Oliver Jowett <oliver@mutability.co.uk> Sat, 06 Dec 2014 18:37:12 +0000
dump1090-mr (1.08.2302.14+1-1) unstable; urgency=medium
* Initial package release.
-- Oliver Jowett <oliver@mutability.co.uk> Fri, 05 Dec 2014 22:55:41 +0000

18
debian/control vendored
View File

@ -1,13 +1,13 @@
Source: dump1090-mr Source: dump1090-flightaware
Section: embedded Section: embedded
Priority: extra Priority: extra
Maintainer: Oliver Jowett <oliver@mutability.co.uk> Maintainer: Oliver Jowett <oliver@mutability.co.uk>
Build-Depends: debhelper(>=8), librtlsdr-dev Build-Depends: debhelper(>=8), librtlsdr-dev
Standards-Version: 3.9.3 Standards-Version: 3.9.3
Homepage: https://github.com/MalcolmRobb/dump1090 Homepage: https://github.com/flightaware/dump1090_mr
Vcs-Git: https://github.com/mutability/dump1090.git -b mr-pi-package Vcs-Git: https://github.com/mutability/dump1090.git -b fa-pi-package
Package: dump1090-mr Package: dump1090-flightaware
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, adduser Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
Description: ADS-B Ground Station System for RTL-SDR Description: ADS-B Ground Station System for RTL-SDR
@ -17,4 +17,12 @@ Description: ADS-B Ground Station System for RTL-SDR
Includes a mini-webserver that you can access to see aircraft in the vicinity Includes a mini-webserver that you can access to see aircraft in the vicinity
of your receiver. of your receiver.
. .
This is a packaging of MalcomRobb's fork of the original dump1090 version. This is a packaging of the FlightAware fork of dump1090, adding support for
the "fatsv" protocol used by FlightAware.
Package: faup1090
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
Description: ADS-B protocol adaptor for FlightAware
This is a packaging of a FlightAware utility based on dump1090 that generates
FlightAware's "fatsv" protocol from AVR or Beast format ADS-B data.

6
debian/copyright vendored
View File

@ -1,10 +1,10 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: dump1090 Upstream-Name: dump1090
Upstream-Contact: https://github.com/MalcolmRobb Upstream-Contact: FlightAware Developers <adsb-devs@flightaware.com>
Source: https://github.com/MalcolmRobb/dump1090 Source: https://github.com/flightaware/dump1090_mr
Files: * Files: *
Copyright: Salvatore Sanfilippo, Malcom Robb and other contributors. Copyright: Salvatore Sanfilippo, Malcom Robb, FlightAware LLC and other contributors.
License: BSD-3-Clause License: BSD-3-Clause
Files: debian/* Files: debian/*

10
debian/dump1090-mr.default → debian/dump1090-flightaware.default vendored
View File

@ -1,4 +1,4 @@
# Defaults for dump1090-mr # Defaults for dump1090-flightaware
# This is a POSIX shell fragment # This is a POSIX shell fragment
# Set to "yes" to start dump1090 on boot. # Set to "yes" to start dump1090 on boot.
@ -8,7 +8,7 @@ START_DUMP1090="no"
DUMP1090_USER="dump1090" DUMP1090_USER="dump1090"
# Logfile to log to # Logfile to log to
#LOGFILE="/var/log/dump1090-mr.log" #LOGFILE="/var/log/dump1090-flightaware.log"
# #
# The following options are all optional - defaults if not provided are # The following options are all optional - defaults if not provided are
@ -58,6 +58,9 @@ DUMP1090_USER="dump1090"
# Port to listen on for HTTP connections. 0 disables. # Port to listen on for HTTP connections. 0 disables.
#HTTP_PORT=8080 #HTTP_PORT=8080
# Port to listen on for FlightAware "fatsv" output connections. 0 disables.
#FATSV_OUTPUT_PORT=10001
# Port to listen on for raw (AVR-format) input connections. 0 disables. # Port to listen on for raw (AVR-format) input connections. 0 disables.
#RAW_INPUT_PORT=30001 #RAW_INPUT_PORT=30001
@ -85,9 +88,6 @@ DUMP1090_USER="dump1090"
# TCP buffer size order. Power-of-two based - buffer size is 2^(n+16). # TCP buffer size order. Power-of-two based - buffer size is 2^(n+16).
#NET_BUFFER=0 #NET_BUFFER=0
# Bind ports on a particular address. If unset, binds to all interfaces.
#BIND_ADDRESS=
# #
# Misc options # Misc options
# #

10
debian/dump1090-mr.init → debian/dump1090-flightaware.init vendored
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
### BEGIN INIT INFO ### BEGIN INIT INFO
# Provides: dump1090-mr # Provides: dump1090-flightaware
# Required-Start: $remote_fs # Required-Start: $remote_fs
# Required-Stop: $remote_fs # Required-Stop: $remote_fs
# Default-Start: 2 3 4 5 # Default-Start: 2 3 4 5
@ -15,8 +15,8 @@
# PATH should only include /usr/* if it runs after the mountnfs.sh script # PATH should only include /usr/* if it runs after the mountnfs.sh script
PATH=/sbin:/usr/sbin:/bin:/usr/bin PATH=/sbin:/usr/sbin:/bin:/usr/bin
DESC="dump1090-mr daemon" DESC="dump1090-flightaware daemon"
NAME=dump1090-mr NAME=dump1090-flightaware
DAEMON=/usr/bin/$NAME DAEMON=/usr/bin/$NAME
ARGS="--quiet" ARGS="--quiet"
PIDFILE=/var/run/$NAME.pid PIDFILE=/var/run/$NAME.pid
@ -38,6 +38,7 @@ AGGRESSIVE=no
LAT= LAT=
LON= LON=
HTTP_PORT=8080 HTTP_PORT=8080
FATSV_OUTPUT_PORT=10001
RAW_INPUT_PORT=30001 RAW_INPUT_PORT=30001
RAW_OUTPUT_PORT=30002 RAW_OUTPUT_PORT=30002
SBS_OUTPUT_PORT=30003 SBS_OUTPUT_PORT=30003
@ -47,7 +48,6 @@ NET_HEARTBEAT=60
NET_OUTPUT_SIZE=5 NET_OUTPUT_SIZE=5
NET_OUTPUT_RATE=5 NET_OUTPUT_RATE=5
NET_BUFFER=0 NET_BUFFER=0
BIND_ADDRESS=
STATS_INTERVAL=3600 STATS_INTERVAL=3600
EXTRA_ARGS= EXTRA_ARGS=
@ -78,6 +78,7 @@ if [ -n "$LON" ]; then ARGS="$ARGS --lon $LON"; fi
# net: # net:
if [ "x$HTTP_PORT" != "x8080" ]; then ARGS="$ARGS --net-http-port $HTTP_PORT"; fi if [ "x$HTTP_PORT" != "x8080" ]; then ARGS="$ARGS --net-http-port $HTTP_PORT"; fi
if [ "x$FATSV_OUTPUT_PORT" != "x10001" ]; then ARGS="$ARGS --net-fatsv-port $FATSV_OUTPUT_PORT"; fi
if [ "x$RAW_INPUT_PORT" != "x30001" ]; then ARGS="$ARGS --net-ri-port $RAW_INPUT_PORT"; fi if [ "x$RAW_INPUT_PORT" != "x30001" ]; then ARGS="$ARGS --net-ri-port $RAW_INPUT_PORT"; fi
if [ "x$RAW_OUTPUT_PORT" != "x30002" ]; then ARGS="$ARGS --net-ro-port $RAW_OUTPUT_PORT"; fi if [ "x$RAW_OUTPUT_PORT" != "x30002" ]; then ARGS="$ARGS --net-ro-port $RAW_OUTPUT_PORT"; fi
if [ "x$SBS_OUTPUT_PORT" != "x30003" ]; then ARGS="$ARGS --net-sbs-port $SBS_OUTPUT_PORT"; fi if [ "x$SBS_OUTPUT_PORT" != "x30003" ]; then ARGS="$ARGS --net-sbs-port $SBS_OUTPUT_PORT"; fi
@ -87,7 +88,6 @@ if [ "x$NET_HEARTBEAT" != "x60" ]; then ARGS="$ARGS --net-heartbeat $NET_HEARTBE
if [ "x$NET_OUTPUT_SIZE" != "x0" ]; then ARGS="$ARGS --net-ro-size $NET_OUTPUT_SIZE"; fi if [ "x$NET_OUTPUT_SIZE" != "x0" ]; then ARGS="$ARGS --net-ro-size $NET_OUTPUT_SIZE"; fi
if [ "x$NET_OUTPUT_RATE" != "x0" ]; then ARGS="$ARGS --net-ro-rate $NET_OUTPUT_RATE"; fi if [ "x$NET_OUTPUT_RATE" != "x0" ]; then ARGS="$ARGS --net-ro-rate $NET_OUTPUT_RATE"; fi
if [ "x$NET_BUFFER" != "x0" ]; then ARGS="$ARGS --net-buffer $NET_BUFFER"; fi if [ "x$NET_BUFFER" != "x0" ]; then ARGS="$ARGS --net-buffer $NET_BUFFER"; fi
if [ -n "$BIND_ADDRESS" ]; then ARGS="$ARGS --net-bind-address $BIND_ADDRESS"; fi
# misc: # misc:
if [ "x$STATS_INTERVAL" != "x0" ]; then ARGS="$ARGS --stats-every $STATS_INTERVAL"; fi if [ "x$STATS_INTERVAL" != "x0" ]; then ARGS="$ARGS --stats-every $STATS_INTERVAL"; fi

3
debian/dump1090-flightaware.install vendored Normal file
View File

@ -0,0 +1,3 @@
dump1090-flightaware usr/bin
view1090-flightaware usr/bin
public_html/* usr/share/dump1090-flightaware

2
debian/dump1090-mr.logrotate → debian/dump1090-flightaware.logrotate vendored
View File

@ -1,4 +1,4 @@
/var/log/dump1090-mr.log { /var/log/dump1090-flightaware.log {
weekly weekly
rotate 4 rotate 4
copytruncate copytruncate

1
debian/dump1090-flightaware.manpages vendored Normal file
View File

@ -0,0 +1 @@
debian/tmp/dump1090-flightaware.1

2
debian/dump1090-mr.postinst → debian/dump1090-flightaware.postinst vendored
View File

@ -20,7 +20,7 @@ set -e
case "$1" in case "$1" in
configure) configure)
adduser --system --home /usr/share/dump1090-mr --no-create-home --quiet dump1090 adduser --system --home /usr/share/dump1090-flightaware --no-create-home --quiet dump1090
;; ;;
abort-upgrade|abort-remove|abort-deconfigure) abort-upgrade|abort-remove|abort-deconfigure)

1
debian/dump1090-mr.install vendored
View File

@ -1 +0,0 @@
public_html/* usr/share/dump1090-mr

1
debian/faup1090.install vendored Normal file
View File

@ -0,0 +1 @@
faup1090 usr/bin

13
debian/rules vendored
View File

@ -15,13 +15,18 @@ DPKG_EXPORT_BUILDFLAGS = 1
include /usr/share/dpkg/buildflags.mk include /usr/share/dpkg/buildflags.mk
override_dh_auto_build: override_dh_auto_build:
dh_auto_build -- 'EXTRACFLAGS=-DHTMLPATH=\"/usr/share/dump1090-mr\"' dh_auto_build -- 'EXTRACFLAGS=-DHTMLPATH=\"/usr/share/dump1090-flightaware\"'
dh_auto_build -- -f makefaup1090 'EXTRACFLAGS=-DHTMLPATH=\"/usr/share/dump1090-flightaware\"' faup1090
override_dh_auto_install:
# we don't want to use the Makefile auto-install here, we handle it in dh_install
override_dh_install: override_dh_install:
mkdir -p debian/tmp
cp -a doc/dump1090.1 debian/tmp/dump1090-flightaware.1
cp -a dump1090 debian/tmp/dump1090-flightaware
cp -a view1090 debian/tmp/view1090-flightaware
dh_install dh_install
install -d debian/dump1090-mr/usr/bin
cp -a dump1090 debian/dump1090-mr/usr/bin/dump1090-mr
cp -a view1090 debian/dump1090-mr/usr/bin/view1090-mr
%: %:
dh $@ dh $@