Mirror/intercept
1
0
Fork 0
mirror of https://github.com/smittix/intercept.git synced 2026-06-08 06:01:56 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix: Use ldconfig priority file instead of removing apt rtl-sdr packages

Browse Source 
The apt-removal approach caused cascading failures: removing librtlsdr0
swept out dump1090-mutability and other reverse deps, then source builds
reinstalled librtlsdr-dev (pulling librtlsdr0 back), and the dump1090
subshell crashed because kill "" (empty progress_pid after progress_pid=)
returned non-zero and fired the global ERR trap.

Switch to a targeted ldconfig priority file instead:
- Write /etc/ld.so.conf.d/00-local-first.conf containing /usr/local/lib
- Files named 00-* sort before aarch64-linux-gnu.conf alphabetically,
  so ldconfig lists /usr/local/lib/librtlsdr.so.0 (Blog) first
- apt librtlsdr0, rtl-sdr, dump1090-mutability etc. are never touched
- Source build functions keep their unconditional apt_install librtlsdr-dev

Also fix the dump1090 EXIT trap: guard kill/wait against empty
progress_pid so it does not fire the ERR trap after a clean exit 0.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Smittix
2026-02-18 17:10:42 +00:00
parent b70db887b1
commit 622f23c091
1 changed files with 13 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
setup.sh
+13 -32
View File
@@ -1088,11 +1088,8 @@ install_dump1090_from_source_debian() {
info "dump1090 not available via APT. Building from source (required)..."
apt_install build-essential git pkg-config \
libusb-1.0-0-dev \
librtlsdr-dev libusb-1.0-0-dev \
libncurses-dev tcl-dev python3-dev
# If Blog drivers are installed they supply headers via pkg-config;
# installing apt librtlsdr-dev would pull librtlsdr0 back and shadow them.
pkg-config --exists librtlsdr 2>/dev/null || apt_install librtlsdr-dev
local JOBS
JOBS="$(nproc 2>/dev/null || echo 1)"
@@ -1100,7 +1097,7 @@ install_dump1090_from_source_debian() {
# Run in subshell to isolate EXIT trap
(
tmp_dir="$(mktemp -d)"
trap 'kill "$progress_pid" 2>/dev/null; wait "$progress_pid" 2>/dev/null || true; rm -rf "$tmp_dir"' EXIT
trap '{ [[ -n "${progress_pid:-}" ]] && kill "$progress_pid" 2>/dev/null && wait "$progress_pid" 2>/dev/null || true; }; rm -rf "$tmp_dir"' EXIT
info "Cloning FlightAware dump1090..."
git clone --depth 1 https://github.com/flightaware/dump1090.git "$tmp_dir/dump1090" >/dev/null 2>&1 \
@@ -1156,8 +1153,7 @@ install_acarsdec_from_source_debian() {
info "acarsdec not available via APT. Building from source..."
apt_install build-essential git cmake \
libusb-1.0-0-dev libsndfile1-dev
pkg-config --exists librtlsdr 2>/dev/null || apt_install librtlsdr-dev
librtlsdr-dev libusb-1.0-0-dev libsndfile1-dev
# Run in subshell to isolate EXIT trap
(
@@ -1185,8 +1181,7 @@ install_dumpvdl2_from_source_debian() {
info "Building dumpvdl2 from source (with libacars dependency)..."
apt_install build-essential git cmake \
libusb-1.0-0-dev libglib2.0-dev libxml2-dev
pkg-config --exists librtlsdr 2>/dev/null || apt_install librtlsdr-dev
librtlsdr-dev libusb-1.0-0-dev libglib2.0-dev libxml2-dev
(
tmp_dir="$(mktemp -d)"
@@ -1232,8 +1227,7 @@ install_aiscatcher_from_source_debian() {
info "AIS-catcher not available via APT. Building from source..."
apt_install build-essential git cmake pkg-config \
libusb-1.0-0-dev libcurl4-openssl-dev zlib1g-dev
pkg-config --exists librtlsdr 2>/dev/null || apt_install librtlsdr-dev
librtlsdr-dev libusb-1.0-0-dev libcurl4-openssl-dev zlib1g-dev
# Run in subshell to isolate EXIT trap
(
@@ -1321,19 +1315,14 @@ install_rtlsdr_blog_drivers_debian() {
$SUDO udevadm trigger || true
fi
# Remove ALL apt rtl-sdr packages (binaries AND library) so nothing
# shadows /usr/local/lib/librtlsdr.so.0 from the Blog drivers.
# Removing only rtl-sdr leaves librtlsdr0 installed; ldconfig then
# picks /lib/aarch64-linux-gnu/librtlsdr.so.0 (apt, no R828D support)
# over /usr/local/lib/librtlsdr.so.0 (Blog drivers) because the
# multiarch path is searched first.
local pkgs_to_remove=()
for pkg in rtl-sdr librtlsdr0 librtlsdr-dev; do
dpkg -l "$pkg" 2>/dev/null | grep -q "^ii" && pkgs_to_remove+=("$pkg")
done
if [[ ${#pkgs_to_remove[@]} -gt 0 ]]; then
info "Removing apt rtl-sdr packages to prevent library conflicts: ${pkgs_to_remove[*]}"
$SUDO apt-get remove -y "${pkgs_to_remove[@]}" >/dev/null 2>&1 || true
# Make the Blog drivers' library take priority over the apt-installed
# librtlsdr. Removing apt packages is too destructive (dump1090-mutability
# and other tools depend on librtlsdr0 and get swept out). Instead,
# prepend /usr/local/lib to ldconfig's search path — files named 00-*
# sort before the distro's aarch64-linux-gnu.conf — so ldconfig lists
# /usr/local/lib/librtlsdr.so.0 first and the dynamic linker uses it.
if [[ -d /etc/ld.so.conf.d ]]; then
echo '/usr/local/lib' | $SUDO tee /etc/ld.so.conf.d/00-local-first.conf >/dev/null
fi
$SUDO ldconfig
@@ -1347,14 +1336,6 @@ install_rtlsdr_blog_drivers_debian() {
fi
)
# apt may have removed dump1090-mutability (or similar) as a reverse
# dependency of librtlsdr0. Rebuild from source now so the ADS-B
# decoder is available. The source build functions above now guard
# against pulling apt librtlsdr-dev back in, so this is safe.
if ! cmd_exists dump1090 && ! cmd_exists dump1090-mutability; then
info "Rebuilding dump1090 from source (removed as reverse dep of librtlsdr0)..."
install_dump1090_from_source_debian
fi
}
setup_udev_rules_debian() {