AFG/dump1090
3
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Tweak wheezy build so it builds rtl-sdr itself rather than relying

Browse source 
on a librtlsdr-dev package that needs to be built separately.
This commit is contained in:
Oliver Jowett 2016-09-16 16:19:16 +01:00
parent daa3e00ade
commit b213ab9a50
4 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Makefile
View file

@ -46,16 +46,17 @@ all: dump1090 view1090
%.o: %.c *.h %.o: %.c *.h
$(CC) $(CPPFLAGS) $(CFLAGS) $(EXTRACFLAGS) -c $< -o $@ $(CC) $(CPPFLAGS) $(CFLAGS) $(EXTRACFLAGS) -c $< -o $@
dump1090: LDFLAGS += `pkg-config --libs-only-L librtlsdr`
dump1090.o: CFLAGS += `pkg-config --cflags librtlsdr` dump1090.o: CFLAGS += `pkg-config --cflags librtlsdr`
dump1090: dump1090.o anet.o interactive.o mode_ac.o mode_s.o net_io.o crc.o demod_2400.o stats.o cpr.o icao_filter.o track.o util.o convert.o $(COMPAT) dump1090: dump1090.o anet.o interactive.o mode_ac.o mode_s.o net_io.o crc.o demod_2400.o stats.o cpr.o icao_filter.o track.o util.o convert.o $(COMPAT)
$(CC) -g -o $@ $^ $(LIBS) $(LIBS_RTL) $(LDFLAGS) $(CC) -g -o $@ $^ $(LDFLAGS) $(LIBS) $(LIBS_RTL)
view1090: view1090.o anet.o interactive.o mode_ac.o mode_s.o net_io.o crc.o stats.o cpr.o icao_filter.o track.o util.o $(COMPAT) view1090: view1090.o anet.o interactive.o mode_ac.o mode_s.o net_io.o crc.o stats.o cpr.o icao_filter.o track.o util.o $(COMPAT)
$(CC) -g -o $@ $^ $(LIBS) $(LDFLAGS) $(CC) -g -o $@ $^ $(LDFLAGS) $(LIBS)
faup1090: faup1090.o anet.o mode_ac.o mode_s.o net_io.o crc.o stats.o cpr.o icao_filter.o track.o util.o $(COMPAT) faup1090: faup1090.o anet.o mode_ac.o mode_s.o net_io.o crc.o stats.o cpr.o icao_filter.o track.o util.o $(COMPAT)
$(CC) -g -o $@ $^ $(LIBS) $(LDFLAGS) $(CC) -g -o $@ $^ $(LDFLAGS) $(LIBS)
clean: clean:
rm -f *.o compat/clock_gettime/*.o compat/clock_nanosleep/*.o dump1090 view1090 faup1090 cprtests crctests rm -f *.o compat/clock_gettime/*.o compat/clock_nanosleep/*.o dump1090 view1090 faup1090 cprtests crctests

2
debian-wheezy/control
View file

@ -2,7 +2,7 @@ Source: dump1090-fa
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(>=9), librtlsdr-dev, libusb-1.0-0-dev, pkg-config Build-Depends: debhelper(>=9), libusb-1.0-0-dev, pkg-config, cmake
Standards-Version: 3.9.3 Standards-Version: 3.9.3
Homepage: https://github.com/mutability/dump1090 Homepage: https://github.com/mutability/dump1090
Vcs-Git: https://github.com/mutability/dump1090.git Vcs-Git: https://github.com/mutability/dump1090.git

12
debian-wheezy/rules
View file

@ -17,8 +17,12 @@ include /usr/share/dpkg/buildflags.mk
export DUMP1090_VERSION=$(shell dpkg-parsechangelog | sed -n 's/^Version: /v/p') export DUMP1090_VERSION=$(shell dpkg-parsechangelog | sed -n 's/^Version: /v/p')
SRCNAME=$(shell dpkg-parsechangelog | sed -n 's/^Source: //p') SRCNAME=$(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
override_dh_auto_build: install_rtlsdr:
dh_auto_build -- 'EXTRACFLAGS=-DHTMLPATH=\"/usr/share/$(SRCNAME)/html\" -DMODES_DUMP1090_VARIANT=\"$(SRCNAME)\"' STATIC=yes mkdir rtl-sdr-build
cd rtl-sdr-build && cmake ../rtl-sdr -DCMAKE_INSTALL_PREFIX=./install && make install
override_dh_auto_build: install_rtlsdr
dh_auto_build -- 'EXTRACFLAGS=-DHTMLPATH=\"/usr/share/$(SRCNAME)/html\" -DMODES_DUMP1090_VARIANT=\"$(SRCNAME)\"' STATIC=yes PKG_CONFIG_PATH=rtl-sdr-build/install/lib/pkgconfig
override_dh_install: override_dh_install:
dh_install dh_install
@ -26,5 +30,9 @@ override_dh_install:
cp -a dump1090 debian/dump1090-fa/usr/bin/dump1090-fa cp -a dump1090 debian/dump1090-fa/usr/bin/dump1090-fa
cp -a view1090 debian/dump1090-fa/usr/bin/view1090-fa cp -a view1090 debian/dump1090-fa/usr/bin/view1090-fa
override_dh_clean:
dh_clean
rm -fr rtl-sdr-build
%: %:
dh $@ dh $@

3
prepare-wheezy-tree.sh
View file

@ -17,4 +17,7 @@ cp -a $TOP/debian-wheezy/* $OUT/debian/
echo "Updating changelog for wheezy backport build" echo "Updating changelog for wheezy backport build"
dch --changelog $OUT/debian/changelog --bpo --distribution wheezy-backports "Automated backport build for wheezy" dch --changelog $OUT/debian/changelog --bpo --distribution wheezy-backports "Automated backport build for wheezy"
echo "Cloning rtl-sdr source"
git clone git://git.osmocom.org/rtl-sdr.git $OUT/rtl-sdr
echo "OK, ready to go in $OUT" echo "OK, ready to go in $OUT"