From b213ab9a505a25b747c3ec764d25ec0cbe99dd3b Mon Sep 17 00:00:00 2001 From: Oliver Jowett Date: Fri, 16 Sep 2016 16:19:16 +0100 Subject: [PATCH] Tweak wheezy build so it builds rtl-sdr itself rather than relying on a librtlsdr-dev package that needs to be built separately. --- Makefile | 7 ++++--- debian-wheezy/control | 2 +- debian-wheezy/rules | 12 ++++++++++-- prepare-wheezy-tree.sh | 3 +++ 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 346d2e0..cc91ec3 100644 --- a/Makefile +++ b/Makefile @@ -46,16 +46,17 @@ all: dump1090 view1090 %.o: %.c *.h $(CC) $(CPPFLAGS) $(CFLAGS) $(EXTRACFLAGS) -c $< -o $@ +dump1090: LDFLAGS += `pkg-config --libs-only-L 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) - $(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) - $(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) - $(CC) -g -o $@ $^ $(LIBS) $(LDFLAGS) + $(CC) -g -o $@ $^ $(LDFLAGS) $(LIBS) clean: rm -f *.o compat/clock_gettime/*.o compat/clock_nanosleep/*.o dump1090 view1090 faup1090 cprtests crctests diff --git a/debian-wheezy/control b/debian-wheezy/control index a2b522f..198e02a 100644 --- a/debian-wheezy/control +++ b/debian-wheezy/control @@ -2,7 +2,7 @@ Source: dump1090-fa Section: embedded Priority: extra Maintainer: Oliver Jowett -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 Homepage: https://github.com/mutability/dump1090 Vcs-Git: https://github.com/mutability/dump1090.git diff --git a/debian-wheezy/rules b/debian-wheezy/rules index 3138fba..4dc21b4 100755 --- a/debian-wheezy/rules +++ b/debian-wheezy/rules @@ -17,8 +17,12 @@ include /usr/share/dpkg/buildflags.mk export DUMP1090_VERSION=$(shell dpkg-parsechangelog | sed -n 's/^Version: /v/p') SRCNAME=$(shell dpkg-parsechangelog | sed -n 's/^Source: //p') -override_dh_auto_build: - dh_auto_build -- 'EXTRACFLAGS=-DHTMLPATH=\"/usr/share/$(SRCNAME)/html\" -DMODES_DUMP1090_VARIANT=\"$(SRCNAME)\"' STATIC=yes +install_rtlsdr: + 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: dh_install @@ -26,5 +30,9 @@ override_dh_install: cp -a dump1090 debian/dump1090-fa/usr/bin/dump1090-fa cp -a view1090 debian/dump1090-fa/usr/bin/view1090-fa +override_dh_clean: + dh_clean + rm -fr rtl-sdr-build + %: dh $@ diff --git a/prepare-wheezy-tree.sh b/prepare-wheezy-tree.sh index 6714364..48300ac 100755 --- a/prepare-wheezy-tree.sh +++ b/prepare-wheezy-tree.sh @@ -17,4 +17,7 @@ cp -a $TOP/debian-wheezy/* $OUT/debian/ echo "Updating changelog for wheezy backport build" 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"