Merging debian version 20240610-1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

11 files changed, 68 insertions, 178 deletions

diff --git a/debian/build/version-info b/debian/build/version-info
deleted file mode 100644
index fbc6fae..0000000
--- a/debian/build/version-info
+++ /dev/null
@@ -1,2 +0,0 @@
-Source: firmware-free
-Version: 20200122-4~progress7.99u1
diff --git a/debian/changelog b/debian/changelog
index 54707d2..1dbbcb0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+firmware-free (20240610-1) unstable; urgency=medium
+
+  [ Bastian Germann ]
+  * Build av7110, dsp56k, isci, and usbdux from source (see #890601)
+  * Remove carl9170 firmware and recommend the package containing it
+    (Closes: #1073525)
+
+  [ Ben Hutchings ]
+  * Update to linux-support 6.8.12
+  * d/copyright: Exclude carl9170 firmware from upstream source
+  * New upstream version; no functional changes
+
+ -- Ben Hutchings <benh@debian.org>  Mon, 17 Jun 2024 00:01:17 +0200
+
 firmware-free (20200122-4~progress7.99u1) graograman-backports; urgency=medium
 
   * Initial reupload to graograman-backports.
diff --git a/debian/config/linux-free/defines b/debian/config/linux-free/defines
index 252c61e..85476d1 100644
--- a/debian/config/linux-free/defines
+++ b/debian/config/linux-free/defines
@@ -6,7 +6,6 @@ longdesc:
  Guidelines.
 files:
  av7110/bootcode.bin
- carl9170-1.fw
  cis/3CCFEM556.cis
  cis/3CXEM556.cis
  cis/COMpad2.cis
@@ -32,14 +31,11 @@ files:
  usbduxsigma_firmware.bin
 support: initramfs-tools
 uri: http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git
-recommends: firmware-ath9k-htc
+recommends: firmware-carl9170, firmware-ath9k-htc
 
 [av7110/bootcode.bin_base]
 desc: AV7110 DVB card firmware
 
-[carl9170-1.fw_base]
-desc: Atheros AR9170 free firmware for use with carl9170
-
 [cis/3CCFEM556.cis_base]
 desc: 3Com Megahertz 3CCFEM556 CIS fix
 
diff --git a/debian/control b/debian/control
index 7323f45..66ad5dc 100644
--- a/debian/control
+++ b/debian/control
@@ -1,24 +1,19 @@
 Source: firmware-free
 Section: kernel
 Priority: optional
-Maintainer: Progress Linux Maintainers <maintainers@lists.progress-linux.org>
+Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>
+Uploaders: Ben Hutchings <benh@debian.org>, Salvatore Bonaccorso <carnil@debian.org>
 Standards-Version: 4.5.0
-Build-Depends: debhelper-compat (= 13)
+Build-Depends: debhelper-compat (= 13), a56, as31, gcc-arm-linux-gnueabi
 Rules-Requires-Root: no
-Vcs-Browser: https://git.progress-linux.org/packages/graograman-backports/firmware-free
-Vcs-Git: https://git.progress-linux.org/packages/graograman-backports/firmware-free
-Bugs: mailto:maintainers@lists.progress-linux.org
-XSBC-Original-Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>
-XSBC-Original-Uploaders: Ben Hutchings <benh@debian.org>, Salvatore Bonaccorso <carnil@debian.org>
-XSBC-Original-Vcs-Browser: https://salsa.debian.org/kernel-team/firmware-free
-XSBC-Original-Vcs-Git: https://salsa.debian.org/kernel-team/firmware-free.git
-XSBC-Uploaders: Daniel Baumann <daniel.baumann@progress-linux.org>
+Vcs-Browser: https://salsa.debian.org/kernel-team/firmware-free
+Vcs-Git: https://salsa.debian.org/kernel-team/firmware-free.git
 
 Package: firmware-linux-free
 Architecture: all
 Provides: 
 Depends: ${misc:Depends}
-Recommends: firmware-ath9k-htc
+Recommends: firmware-carl9170, firmware-ath9k-htc
 Suggests: initramfs-tools
 Replaces: 
 Breaks: 
@@ -30,7 +25,6 @@ Description: Binary firmware for various drivers in the Linux kernel
  .
  Contents:
   * AV7110 DVB card firmware (av7110/bootcode.bin)
-  * Atheros AR9170 free firmware for use with carl9170 (carl9170-1.fw)
   * 3Com Megahertz 3CCFEM556 CIS fix (cis/3CCFEM556.cis)
   * 3Com Megahertz 3CXEM556 CIS fix (cis/3CXEM556.cis)
   * Advantech COMpad-32/85 CIS fix (cis/COMpad2.cis)
diff --git a/debian/control.md5sum b/debian/control.md5sum
index 4390cb2..8534127 100644
--- a/debian/control.md5sum
+++ b/debian/control.md5sum
@@ -1,13 +1,13 @@
 caf3c34fbcba55838bdfa573cfa15aeb  debian/bin/gencontrol.py
-0b713f889771f2f7378f34b0f5f242ed  debian/build/version-info
+13970580fa5cac03aa689d89ef40d4c9  debian/build/version-info
 32d1e4b2232b607942d534920ac2b5d7  debian/templates/control.binary.in
 163816c9a25236f4cd7a9a37af4df272  debian/templates/control.binary.udeb.in
 d41d8cd98f00b204e9800998ecf8427e  debian/templates/control.extra.in
-be2d46dde61fdf69264315d113fdf18e  debian/templates/control.source.in
+0736c59fa913fc0a933547dfc3b1313e  debian/templates/control.source.in
 d8ec26344473f36fc003658b597cc8b2  debian/templates/metainfo.xml.firmware.in
 31d44cb249ae2ab2fb80f8971a3c3160  debian/templates/metainfo.xml.in
 f729dae60d5421700fd7cadc198d0e33  debian/templates/metainfo.xml.modalias.in
 1dc2bec8222eb519362c444a4afd1d69  debian/templates/postinst.initramfs-tools.in
 5813dbd3e3b79d998f26e355c4ed2db0  debian/config/defines
-9dcc5209aa4201657dc66abf04dc99d9  debian/config/linux-free/defines
+e04bbd08c4c9e7806372ed07a0655e40  debian/config/linux-free/defines
 8a12e9637e0bdb372d1628afc07c4713  debian/modinfo.json
diff --git a/debian/copyright b/debian/copyright
index c5e2632..fc8e06a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,9 +4,6 @@ Upstream-Contact: linux-firmware@kernel.org
 Source: https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git
 Files-Excluded:
 # Undistributable because:
-# - licence doesn't mention redistribution
- 3com/3C359.bin
- tr_smctr.bin
 # - licence allows redistribution only as part of a kernel
  emi26/*.fw
  emi62/*.fw
@@ -19,7 +16,6 @@ Files-Excluded:
  wsm_22.bin
 # - licence is supposedly GPL, but no source is visible
  adaptec/starfire_*.bin
- atmsar11.fw
  cpia2/stv0672_vp4.bin
  edgeport/*
  ositech/Xilinx7OD.bin
@@ -29,19 +25,22 @@ Files-Excluded:
  whiteheat.fw
  whiteheat_loader.fw
  yamaha/yss225_registers.bin
-# - licence is GPL, but source is elsewhere
+# - licence is GPL, but some or all source is elsewhere
  atusb/*
+ carl9170*
 # - licence is unknown
+ *.py
+ .*
+ Dockerfile
  LICENCE.*
  LICENSE.*
  Makefile
- README
+ README.md
  WHENCE
  acenic/*
  configure
  copy-firmware.sh
  ess/maestro3_*.fw
- intelliport2.bin
  korg/k1212.dsp
  lgs8g75.fw
  mts_mt9234*.fw
@@ -54,37 +53,48 @@ Files-Excluded:
  yamaha/ds1*.fw
 # Non-free
  3com/typhoon.bin
- RTL8192E/*
  advansys/*
  agere_*_fw.bin
+ airoha/*
  amd/*
  amd-ucode/*
  amdgpu/*
+ amdtee/*
+ amlogic/*
+ amphion/*
  ar3k/*
  ar5523.bin
  ar7010*.fw
  ar9170*.fw
  ar9271.fw
+ arm/*
  as102_*
  ath10k/*
+ ath11k/*
+ ath12k/*
  ath3k-1.fw
  ath6k/*
  ath9k_htc/*
  atmel/*
  brcm/*
  bnx2/*
- bnx2x-*
  bnx2x/*
  cadence/*
  cavium/*
  cbfw-*.bin
+ cirrus/*
  cmmb_*.inp
+ cnm/*
+ contrib/process_linux_firmware.py
+ contrib/templates/rpm.spec
+ cs42l43.bin
  ct2fw-*.bin
  ctefx.bin
  ctfw-*.bin
  ctspeq.bin
  cxgb3/*
  cxgb4/*
+ cypress/*
  dabusb/*
  dpaa2/*
  dvb-fe-xc*.fw
@@ -98,18 +108,18 @@ Files-Excluded:
  go7007/*
  hfi1_*.fw
  htc_*.fw
- i2400m-*.sbcf
- i6050-*.sbcf
  i915/*
  imx/*
  inside-secure/*
  intel/*
  isdbt_*.inp
  iwlwifi-*
+ ixp4xx/*
  kaweth/*.bin
  libertas/*
  lbtf_usb.bin
  liquidio/*
+ lt9611uxc_fw.bin
  matrox/*
  mediatek/*
  mellanox/*
@@ -117,7 +127,6 @@ Files-Excluded:
  microchip/*
  moxa/*
  mrvl/*
- mt76*.bin
  mts_cdma.fw
  mts_edge.fw
  mts_gsm.fw
@@ -126,7 +135,9 @@ Files-Excluded:
  myri10ge_*.dat
  netronome/*
  nvidia/*
+ nxp/*
  phanfw.bin
+ powervr/*
  qat_*.bin
  qca/*
  qcom/*
@@ -147,19 +158,21 @@ Files-Excluded:
  rtw88/*
  s5p-mfc*.fw
  sms1xxx-*
- TDA7706*
  tdmb*
  tehuti/*
+ ti/*
  ti-connectivity/*
  ti-keystone/*
  tigon/*
  tlg2300_firmware.bin
+ tsse_firmware.bin
  ueagle-atm/*
  v4l-cx*.fw
  vntwusb.fw
- vpu_?.bin
  vxge/*
+ wfx/*
  wil6210.*
+ xe/*
 
 Files: GPL-2
 Copyright: 1989, 1991, Free Software Foundation, Inc.
@@ -174,71 +187,6 @@ Copyright: 2001, Convergence integrated media GmbH
            2006, Matthieu CASTET
 License: GPL-2+
 
-Files: carl9170fw/* carl9170-1.fw
-Copyright: 2000-2005, ZyDAS Technology Corporation
-           2007-2009, Atheros Communications, Inc.
-	   2008-2009, Johannes Berg <johannes@sipsolutions.net>
-           2009-2011, Christian Lamparter <chunkeey@googlemail.com>
-License: GPL-2+
-
-Files: carl9170fw/carlfw/src/ashlsi3.S carl9170fw/carlfw/src/udivsi3_i4i-Os.S
-Copyright: 1994-1995, 1997-2006, Free Software Foundation, Inc.
-License: GPL-2+
-
-Files: carl9170fw/carlfw/src/memcpy.S carl9170fw/carlfw/src/memset.S
-Copyright: 1999, Niibe Yutaka
-License: GPL-2
-
-Files: carl9170fw/carlfw/src/printf.c
-Copyright: 2004, 2008, Kustaa Nyholm
-License: LGPL-2.1+
-
-Files: carl9170fw/config/*
-Copyright: 2002-2005, Roman Zippel <zippel@linux-m68k.org>
-           2002-2005, Sam Ravnborg <sam@ravnborg.org>
-License: GPL-2
-
-Files: carl9170fw/extra/FindGPERF.cmake
- carl9170fw/extra/FindPackageHandleStandardArgs.cmake
- carl9170fw/extra/GCCVersion.cmake
-Copyright: 2006-2009, Kitware, Inc.
-           2006-2008, Andreas Schneider <mail@cynapses.org>
-	   2006, Tristan Carel
-           2007, Wengo
-           2007, Mike Jackson
-           2008, Andreas Pakulat <apaku@gmx.de>
-           2008-2009, Philip Lowman <philip@yhbt.com>
-License: BSD-3-clause-Kitware
-
-Files: carl9170fw/extra/FindUSB-1.0.cmake
-Copyright: 2009, Andreas Schneider <mail@cynapses.org>
-License: BSD-3-clause-Schneider
-
-Files: carl9170fw/include/linux/ieee80211.h
-Copyright: 2001-2002, SSH Communications Security Corp and Jouni Malinen <jkmaline@cc.hut.fi>
-           2002-2003, Jouni Malinen <jkmaline@cc.hut.fi>
-           2005, Devicescape Software, Inc.
-           2006, Michael Wu <flamingice@sourmilk.net>
-License: GPL-2
-
-Files: carl9170fw/include/shared/fwcmd.h carl9170fw/include/shared/fwdesc.h
- carl9170fw/include/shared/hw.h carl9170fw/include/shared/wlan.h
- carl9170fw/tools/lib/carlfw.c carl9170fw/tools/lib/carlfw.h
- carl9170fw/tools/src/checksum.c carl9170fw/tools/src/eeprom_fix.c
- carl9170fw/tools/src/fwinfo.c carl9170fw/tools/src/miniboot.c
- carl9170fw/tools/src/wol.c
-Copyright: 2008, Johannes Berg <johannes@sipsolutions.net>
-           2009-2011, Christian Lamparter <chunkeey@googlemail.com>
-License: GPL-2
-
-Files: carl9170fw/include/shared/phy.h
-Copyright: 2008-2009 Atheros Communications Inc.
-License: permissive-Atheros
-
-Files: carl9170fw/tools/include/list.h
-Copyright: 2003-2006, Thomas Graf <tgraf@suug.ch>
-License: LGPL-2.1
-
 Files: cis/src/* cis/3CCFEM556.cis cis/3CXEM556.cis cis/COMpad2.cis
  cis/COMpad4.cis cis/DP83903.cis cis/LA-PCM.cis cis/MT5634ZLX.cis
  cis/NE2K.cis cis/PCMLM28.cis cis/PE-200.cis cis/PE520.cis cis/RS-COM-2P.cis
@@ -387,33 +335,6 @@ License: GPL-3
  On Debian systems the text of the GPL version 3 can be found in
  /usr/share/common-licenses/GPL-3.
 
-License: LGPL-2.1
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation, version 2.1.
- .
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- Lesser General Public License for more details.
- .
- On Debian systems the text of the LGPL version 2.1 can be found in
- /usr/share/common-licenses/LGPL-2.1.
-
-License: LGPL-2.1+
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
- .
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- Lesser General Public License for more details.
- .
- On Debian systems the text of the LGPL version 2.1 can be found in
- /usr/share/common-licenses/LGPL-2.1.
-
 License: MPL-1.1
  The contents of this file are subject to the Mozilla Public License
  Version 1.1 (the "License"); you may not use this file except in
@@ -427,20 +348,3 @@ License: MPL-1.1
  .
  On Debian systems the text of the MPL version 1.1 can be found in
  /usr/share/common-licenses/MPL-1.1.
-
-License: permissive-Atheros
- Permission to use, copy, modify, and/or distribute this software for any
- purpose with or without fee is hereby granted, provided that the above
- copyright notice and this permission notice appear in all copies.
- .
- THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-License: verbatim-FSF
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
diff --git a/debian/firmware-linux-free.metainfo.xml b/debian/firmware-linux-free.metainfo.xml
index a1df274..79d71a5 100644
--- a/debian/firmware-linux-free.metainfo.xml
+++ b/debian/firmware-linux-free.metainfo.xml
@@ -6,7 +6,6 @@
   <metadata_license>CC0-1.0</metadata_license>
   <provides>
     <firmware type="runtime">av7110/bootcode.bin</firmware>
-    <firmware type="runtime">carl9170-1.fw</firmware>
     <firmware type="runtime">cis/3CCFEM556.cis</firmware>
     <firmware type="runtime">cis/3CXEM556.cis</firmware>
     <firmware type="runtime">cis/COMpad2.cis</firmware>
@@ -416,32 +415,10 @@
     <modalias>pcmcia:m08A1cC0ABf*fn*pfn00pa*pb*pc*pd*</modalias>
     <modalias>pcmcia:m08A1cC0ABf*fn*pfn01pa*pb*pc*pd*</modalias>
     <modalias>pcmcia:mC001c0009f*fn*pfn*pa*pb*pc*pd*</modalias>
-    <modalias>usb:v0409p0249d*dc*dsc*dp*ic*isc*ip*in*</modalias>
-    <modalias>usb:v0409p02B4d*dc*dsc*dp*ic*isc*ip*in*</modalias>
-    <modalias>usb:v04BBp093Fd*dc*dsc*dp*ic*isc*ip*in*</modalias>
-    <modalias>usb:v057Cp8401d*dc*dsc*dp*ic*isc*ip*in*</modalias>
-    <modalias>usb:v057Cp8402d*dc*dsc*dp*ic*isc*ip*in*</modalias>
-    <modalias>usb:v0586p3417d*dc*dsc*dp*ic*isc*ip*in*</modalias>
     <modalias>usb:v06CDp0103d*dc*dsc*dp*ic*isc*ip*in*</modalias>
     <modalias>usb:v06CDp0104d*dc*dsc*dp*ic*isc*ip*in*</modalias>
-    <modalias>usb:v07D1p3A09d*dc*dsc*dp*ic*isc*ip*in*</modalias>
-    <modalias>usb:v07D1p3A0Fd*dc*dsc*dp*ic*isc*ip*in*</modalias>
-    <modalias>usb:v07D1p3C10d*dc*dsc*dp*ic*isc*ip*in*</modalias>
-    <modalias>usb:v083ApF522d*dc*dsc*dp*ic*isc*ip*in*</modalias>
-    <modalias>usb:v0846p9001d*dc*dsc*dp*ic*isc*ip*in*</modalias>
-    <modalias>usb:v0846p9010d*dc*dsc*dp*ic*isc*ip*in*</modalias>
-    <modalias>usb:v0846p9040d*dc*dsc*dp*ic*isc*ip*in*</modalias>
     <modalias>usb:v085Ap8025d*dc*dsc*dp*ic*isc*ip*in*</modalias>
     <modalias>usb:v085Ap8027d*dc*dsc*dp*ic*isc*ip*in*</modalias>
-    <modalias>usb:v0ACEp1221d*dc*dsc*dp*ic*isc*ip*in*</modalias>
-    <modalias>usb:v0CDEp0023d*dc*dsc*dp*ic*isc*ip*in*</modalias>
-    <modalias>usb:v0CDEp0026d*dc*dsc*dp*ic*isc*ip*in*</modalias>
-    <modalias>usb:v0CDEp0027d*dc*dsc*dp*ic*isc*ip*in*</modalias>
-    <modalias>usb:v0CF3p1001d*dc*dsc*dp*ic*isc*ip*in*</modalias>
-    <modalias>usb:v0CF3p1002d*dc*dsc*dp*ic*isc*ip*in*</modalias>
-    <modalias>usb:v0CF3p1010d*dc*dsc*dp*ic*isc*ip*in*</modalias>
-    <modalias>usb:v0CF3p1011d*dc*dsc*dp*ic*isc*ip*in*</modalias>
-    <modalias>usb:v0CF3p9170d*dc*dsc*dp*ic*isc*ip*in*</modalias>
     <modalias>usb:v13D8p0001d*dc*dsc*dp*ic*isc*ip*in*</modalias>
     <modalias>usb:v13D8p0002d*dc*dsc*dp*ic*isc*ip*in*</modalias>
     <modalias>usb:v13D8p0010d*dc*dsc*dp*ic*isc*ip*in*</modalias>
@@ -449,13 +426,7 @@
     <modalias>usb:v13D8p0020d*dc*dsc*dp*ic*isc*ip*in*</modalias>
     <modalias>usb:v13D8p0021d*dc*dsc*dp*ic*isc*ip*in*</modalias>
     <modalias>usb:v13D8p0022d*dc*dsc*dp*ic*isc*ip*in*</modalias>
-    <modalias>usb:v1435p0326d*dc*dsc*dp*ic*isc*ip*in*</modalias>
-    <modalias>usb:v1435p0804d*dc*dsc*dp*ic*isc*ip*in*</modalias>
     <modalias>usb:v1645p8093d*dc*dsc*dp*ic*isc*ip*in*</modalias>
-    <modalias>usb:v1668p1200d*dc*dsc*dp*ic*isc*ip*in*</modalias>
-    <modalias>usb:v1B75p9170d*dc*dsc*dp*ic*isc*ip*in*</modalias>
-    <modalias>usb:v2019p5304d*dc*dsc*dp*ic*isc*ip*in*</modalias>
-    <modalias>usb:vCACEp0300d*dc*dsc*dp*ic*isc*ip*in*</modalias>
 
   </provides>
 </component>
diff --git a/debian/rules b/debian/rules
index 5af1995..e5f9a3e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,10 +11,23 @@ include debian/rules.defs
 GENCONTROL = debian/bin/gencontrol.py
 
 # Nothing to build
-build-indep build-arch build: debian/control
+build-arch: debian/control
+
+build-indep: debian/control
+	$(MAKE) -C av7110
+	$(MAKE) -C dsp56k
+	$(MAKE) -C isci
+	$(MAKE) -C usbdux -f Makefile_dux
+	cp usbdux/usbdux*_firmware.bin .
+
+build: build-arch build-indep
 
 clean: debian/control
 	dh_testdir
+	$(MAKE) -C av7110 clean
+	$(MAKE) -C dsp56k clean
+	$(MAKE) -C isci clean
+	$(MAKE) -C usbdux -f Makefile_dux clean
 	rm -rf debian/build debian/lib/python/__pycache__
 	dh_clean
 
diff --git a/debian/rules.defs b/debian/rules.defs
index 3976a58..f4192fb 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
@@ -1 +1 @@
-KERNELVERSION := 6.6.15-progress7.99
+KERNELVERSION := 6.8.12
diff --git a/debian/rules.gen b/debian/rules.gen
index 47a63d0..15b8ab5 100644
--- a/debian/rules.gen
+++ b/debian/rules.gen
@@ -7,7 +7,7 @@ endef
 binary-arch_%:
 	@true
 binary-indep:
-	$(MAKE) -f debian/rules.real binary-indep FILES='av7110/bootcode.bin:av7110/bootcode.bin carl9170-1.fw:carl9170-1.fw cis/3CCFEM556.cis:cis/3CCFEM556.cis cis/3CXEM556.cis:cis/3CXEM556.cis cis/COMpad2.cis:cis/COMpad2.cis cis/COMpad4.cis:cis/COMpad4.cis cis/DP83903.cis:cis/DP83903.cis cis/LA-PCM.cis:cis/LA-PCM.cis cis/MT5634ZLX.cis:cis/MT5634ZLX.cis cis/NE2K.cis:cis/NE2K.cis cis/PCMLM28.cis:cis/PCMLM28.cis cis/PE-200.cis:cis/PE-200.cis cis/PE520.cis:cis/PE520.cis cis/RS-COM-2P.cis:cis/RS-COM-2P.cis cis/SW_555_SER.cis:cis/SW_555_SER.cis cis/SW_7xx_SER.cis:cis/SW_7xx_SER.cis cis/SW_8xx_SER.cis:cis/SW_8xx_SER.cis cis/tamarack.cis:cis/tamarack.cis dsp56k/bootstrap.bin:dsp56k/bootstrap.bin isci/isci_firmware.bin:isci/isci_firmware.bin keyspan_pda/keyspan_pda.fw:keyspan_pda/keyspan_pda.fw keyspan_pda/xircom_pgs.fw:keyspan_pda/xircom_pgs.fw usbdux_firmware.bin:usbdux_firmware.bin usbduxfast_firmware.bin:usbduxfast_firmware.bin usbduxsigma_firmware.bin:usbduxsigma_firmware.bin' LINKS='' PACKAGE='linux-free'
+	$(MAKE) -f debian/rules.real binary-indep FILES='av7110/bootcode.bin:av7110/bootcode.bin cis/3CCFEM556.cis:cis/3CCFEM556.cis cis/3CXEM556.cis:cis/3CXEM556.cis cis/COMpad2.cis:cis/COMpad2.cis cis/COMpad4.cis:cis/COMpad4.cis cis/DP83903.cis:cis/DP83903.cis cis/LA-PCM.cis:cis/LA-PCM.cis cis/MT5634ZLX.cis:cis/MT5634ZLX.cis cis/NE2K.cis:cis/NE2K.cis cis/PCMLM28.cis:cis/PCMLM28.cis cis/PE-200.cis:cis/PE-200.cis cis/PE520.cis:cis/PE520.cis cis/RS-COM-2P.cis:cis/RS-COM-2P.cis cis/SW_555_SER.cis:cis/SW_555_SER.cis cis/SW_7xx_SER.cis:cis/SW_7xx_SER.cis cis/SW_8xx_SER.cis:cis/SW_8xx_SER.cis cis/tamarack.cis:cis/tamarack.cis dsp56k/bootstrap.bin:dsp56k/bootstrap.bin isci/isci_firmware.bin:isci/isci_firmware.bin keyspan_pda/keyspan_pda.fw:keyspan_pda/keyspan_pda.fw keyspan_pda/xircom_pgs.fw:keyspan_pda/xircom_pgs.fw usbdux_firmware.bin:usbdux_firmware.bin usbduxfast_firmware.bin:usbduxfast_firmware.bin usbduxsigma_firmware.bin:usbduxsigma_firmware.bin' LINKS='' PACKAGE='linux-free'
 build_%:
 	@true
 setup_%:
diff --git a/debian/templates/control.source.in b/debian/templates/control.source.in
index 0e0e717..ff75a45 100644
--- a/debian/templates/control.source.in
+++ b/debian/templates/control.source.in
@@ -6,7 +6,7 @@ XSBC-Uploaders: Daniel Baumann <daniel.baumann@progress-linux.org>
 XSBC-Original-Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>
 XSBC-Original-Uploaders: Ben Hutchings <benh@debian.org>, Salvatore Bonaccorso <carnil@debian.org>
 Bugs: mailto:maintainers@lists.progress-linux.org
-Build-Depends: debhelper-compat (= 13)
+Build-Depends: debhelper-compat (= 13), a56, as31, gcc-arm-linux-gnueabi
 Rules-Requires-Root: no
 Standards-Version: 4.5.0
 Vcs-Browser: https://git.progress-linux.org/packages/graograman-backports/firmware-free