From b86831c55b3fe9e489343eb34a3dfcd04bd7b49c Mon Sep 17 00:00:00 2001
From: Oliver Smith <osmith@sysmocom.de>
Date: Fri, 12 Nov 2021 17:03:37 +0100
Subject: [PATCH] debian: don't package simtrace2-firmware anymore

Don't attempt to build the firmware with the random default compiler
from the distribution anymore. With some GCC versions, the DFU loader
does not fit the partition anymore.

Related: OS#5260
Change-Id: I95a8472b458db203ad14efd57268ca922c75aeb1
---
 debian/control                    | 14 +-------------
 debian/rules                      |  6 ++++++
 debian/simtrace2-firmware.install |  1 -
 3 files changed, 7 insertions(+), 14 deletions(-)
 delete mode 100644 debian/simtrace2-firmware.install

diff --git a/debian/control b/debian/control
index cbe9f754..4e39381d 100644
--- a/debian/control
+++ b/debian/control
@@ -12,29 +12,17 @@ Build-Depends: debhelper (>= 9),
                dh-autoreconf,
                libosmocore-dev,
                libpcsclite-dev,
-               libnewlib-arm-none-eabi,
-               libusb-1.0-0-dev,
-               gcc-arm-none-eabi
+               libusb-1.0-0-dev
 Standards-Version: 3.9.8
 Vcs-Git: git://git.osmocom.org/simtrace2.git
 Vcs-Browser: http://git.osmocom.org/simtrace2/
 Homepage: http://osmocom.org/projects/simtrace2/wiki
 
-Package: simtrace2-firmware
-Section: devel
-Architecture: all
-Recommends: dfu-util
-Description: Firmware for SAM3 based SIMtrace2 USB Devices.
- Open Source firmware for the Cortex-M3 microcontroller in the
- "Osmocom SIMtrace2" USB-attached peripheral device.  Will only work in
- SAM3S-based SIMtrace2, not in its SAM7S-based predecessor SIMtrace!
-
 Package: simtrace2-utils
 Section: devel
 Architecture: any
 Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends}, libosmo-simtrace2-0
-Recommends: simtrace2-firmware
 Description: Host utilities to communicate with SIMtrace2 USB Devices.
 
 Package: libosmo-simtrace2-0
diff --git a/debian/rules b/debian/rules
index 2c615db6..e908999d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,3 +17,9 @@ export DEB_LDFLAGS_MAINT_STRIP = -Wl,-Bsymbolic-functions
 
 override_dh_autoreconf:
 	cd host && dh_autoreconf
+
+override_dh_auto_build:
+	dh_auto_build -- utils
+
+override_dh_auto_install:
+	dh_auto_build -- -C host
diff --git a/debian/simtrace2-firmware.install b/debian/simtrace2-firmware.install
deleted file mode 100644
index 9be493ae..00000000
--- a/debian/simtrace2-firmware.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/simtrace2/*.bin