diff mbox series

[J,linux-firmware] UBUNTU: [Packaging] Remove udebs

Message ID 20220126074454.8661-1-juergh@canonical.com
State New
Headers show
Series [J,linux-firmware] UBUNTU: [Packaging] Remove udebs | expand

Commit Message

Juerg Haefliger Jan. 26, 2022, 7:44 a.m. UTC 
We no longer need/build udebs so remove it all.

Ignore: yes
Signed-off-by: Juerg Haefliger <juergh@canonical.com>
---
 debian/control                   |  16 ----
 debian/nic-firmware.lst          | 144 -------------------------------
 debian/rules                     |  14 ---
 debian/scripts/list-udeb-updates | 101 ----------------------
 debian/scsi-firmware.lst         |  14 ---
 5 files changed, 289 deletions(-)
 delete mode 100644 debian/nic-firmware.lst
 delete mode 100755 debian/scripts/list-udeb-updates
 delete mode 100644 debian/scsi-firmware.lst

Comments

Dimitri John Ledkov Jan. 26, 2022, 3:34 p.m. UTC | #1 
Acked-With-Prejudice: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
Juerg Haefliger Jan. 27, 2022, 12:05 p.m. UTC | #2 
Applied to linux-firmware jammy branch.

...Juerg


> We no longer need/build udebs so remove it all.
> 
> Ignore: yes
> Signed-off-by: Juerg Haefliger <juergh@canonical.com>
> ---
>  debian/control                   |  16 ----
>  debian/nic-firmware.lst          | 144 -------------------------------
>  debian/rules                     |  14 ---
>  debian/scripts/list-udeb-updates | 101 ----------------------
>  debian/scsi-firmware.lst         |  14 ---
>  5 files changed, 289 deletions(-)
>  delete mode 100644 debian/nic-firmware.lst
>  delete mode 100755 debian/scripts/list-udeb-updates
>  delete mode 100644 debian/scsi-firmware.lst
> 
> diff --git a/debian/control b/debian/control
> index 932afc45a500..1590f9dfbd47 100644
> --- a/debian/control
> +++ b/debian/control
> @@ -18,19 +18,3 @@ Replaces: atmel-firmware, linux-restricted-common, linux-firmware-snapdragon (<=
>  Breaks: linux-firmware-snapdragon (<= 1.2-0ubuntu1), linux-firmware-raspi2 (<= 1.20190819-0ubuntu2)
>  Description: Firmware for Linux kernel drivers
>   This package provides firmware used by Linux kernel drivers.
> -
> -Package: nic-firmware
> -Build-Profiles: <!noudeb>
> -XC-Package-Type: udeb
> -Architecture: all
> -Section: debian-installer
> -Description: Firmware for NICs
> - This package contains firmware needed by some network controllers.
> -
> -Package: scsi-firmware
> -Build-Profiles: <!noudeb>
> -XC-Package-Type: udeb
> -Architecture: all
> -Section: debian-installer
> -Description: Firmware for SCSI controllers
> - This package contains firmware needed by some scsi controllers.
> diff --git a/debian/nic-firmware.lst b/debian/nic-firmware.lst
> deleted file mode 100644
> index 36294962f826..000000000000
> --- a/debian/nic-firmware.lst
> +++ /dev/null
> @@ -1,144 +0,0 @@
> -3com/typhoon.bin
> -adaptec/starfire_rx.bin
> -adaptec/starfire_tx.bin
> -agere_sta_fw.bin
> -ath9k_htc/htc_7010-1.4.0.fw
> -ath9k_htc/htc_9271-1.4.0.fw
> -atmel_at76c504_2958.bin
> -atmel_at76c504a_2958.bin
> -brcm/bcm43xx-0.fw
> -brcm/bcm43xx_hdr-0.fw
> -brcm/brcmfmac43143.bin
> -brcm/brcmfmac43143-sdio.bin
> -brcm/brcmfmac43236b.bin
> -brcm/brcmfmac43241b0-sdio.bin
> -brcm/brcmfmac43241b4-sdio.bin
> -brcm/brcmfmac43241b5-sdio.bin
> -brcm/brcmfmac43242a.bin
> -brcm/brcmfmac4329-sdio.bin
> -brcm/brcmfmac4330-sdio.bin
> -brcm/brcmfmac43340-sdio.bin
> -brcm/brcmfmac4334-sdio.bin
> -brcm/brcmfmac4335-sdio.bin
> -brcm/brcmfmac43362-sdio.bin
> -brcm/brcmfmac4339-sdio.bin
> -brcm/brcmfmac43455-sdio.bin
> -brcm/brcmfmac4350-pcie.bin
> -brcm/brcmfmac4354-sdio.bin
> -brcm/brcmfmac43430-sdio.bin
> -brcm/brcmfmac43430a0-sdio.bin
> -brcm/brcmfmac4350c2-pcie.bin
> -brcm/brcmfmac43569.bin
> -brcm/brcmfmac4356-pcie.bin
> -brcm/brcmfmac4356-sdio.bin
> -brcm/brcmfmac43570-pcie.bin
> -brcm/brcmfmac4358-pcie.bin
> -brcm/brcmfmac43602-pcie.bin
> -brcm/brcmfmac4366b-pcie.bin
> -brcm/brcmfmac4366c-pcie.bin
> -brcm/brcmfmac4371-pcie.bin
> -brcm/brcmfmac4373-sdio.bin
> -brcm/brcmfmac4373.bin
> -e100/d101m_ucode.bin
> -e100/d101s_ucode.bin
> -e100/d102e_ucode.bin
> -hfi1_dc8051.fw
> -hfi1_fabric.fw
> -hfi1_pcie.fw
> -hfi1_sbus.fw
> -ipw2100-1.3.fw
> -ipw2100-1.3-i.fw
> -ipw2100-1.3-p.fw
> -ipw2200-bss.fw
> -ipw2200-ibss.fw
> -ipw2200-sniffer.fw
> -rt2561.bin
> -rt2561s.bin
> -rt2661.bin
> -rt2860.bin
> -rt2870.bin
> -rt73.bin
> -rtl_nic/rtl8411-1.fw
> -rtl_nic/rtl8411-2.fw
> -rtl_nic/rtl8106e-1.fw
> -rtl_nic/rtl8106e-2.fw
> -rtl_nic/rtl8107e-1.fw
> -rtl_nic/rtl8107e-2.fw
> -rtl_nic/rtl8125a-3.fw
> -rtl_nic/rtl8125b-2.fw
> -rtl_nic/rtl8153a-2.fw
> -rtl_nic/rtl8153a-3.fw
> -rtl_nic/rtl8153a-4.fw
> -rtl_nic/rtl8153b-2.fw
> -rtl_nic/rtl8168fp-3.fw
> -rtl_nic/rtl8168e-2.fw
> -rtl_nic/rtl8168d-2.fw
> -rtl_nic/rtl8105e-1.fw
> -rtl_nic/rtl8168e-3.fw
> -rtl_nic/rtl8168d-1.fw
> -rtl_nic/rtl8168e-1.fw
> -rtl_nic/rtl8168f-2.fw
> -rtl_nic/rtl8168f-1.fw
> -rtl_nic/rtl8168g-2.fw
> -rtl_nic/rtl8168g-3.fw
> -rtl_nic/rtl8168h-1.fw
> -rtl_nic/rtl8168h-2.fw
> -rtl_nic/rtl8402-1.fw
> -sun/cassini.bin
> -tigon/tg3.bin
> -tigon/tg3_tso5.bin
> -bnx2/bnx2-mips-06-6.2.3.fw
> -bnx2/bnx2-mips-09-6.2.1b.fw
> -bnx2/bnx2-rv2p-06-6.0.15.fw
> -bnx2/bnx2-rv2p-09ax-6.0.17.fw
> -bnx2/bnx2-rv2p-09-6.0.17.fw
> -bnx2x/bnx2x-e1-7.13.15.0.fw
> -bnx2x/bnx2x-e1h-7.13.15.0.fw
> -bnx2x/bnx2x-e2-7.13.15.0.fw
> -phanfw.bin
> -iwlwifi-1000-5.ucode
> -iwlwifi-100-5.ucode
> -iwlwifi-105-6.ucode
> -iwlwifi-135-6.ucode
> -iwlwifi-2000-6.ucode
> -iwlwifi-2030-6.ucode
> -iwlwifi-3160-17.ucode
> -iwlwifi-3168-29.ucode
> -iwlwifi-3945-2.ucode
> -iwlwifi-4965-2.ucode
> -iwlwifi-5000-5.ucode
> -iwlwifi-5150-2.ucode
> -iwlwifi-6000-4.ucode
> -iwlwifi-6000g2a-6.ucode
> -iwlwifi-6000g2b-6.ucode
> -iwlwifi-6050-5.ucode
> -iwlwifi-7260-17.ucode
> -iwlwifi-7265-17.ucode
> -iwlwifi-7265D-29.ucode
> -iwlwifi-8000C-36.ucode
> -iwlwifi-8265-36.ucode
> -iwlwifi-9000-pu-b0-jf-b0-46.ucode
> -iwlwifi-9260-th-b0-jf-b0-46.ucode
> -iwlwifi-Qu-b0-hr-b0-55.ucode
> -iwlwifi-Qu-b0-hr-b0-59.ucode
> -iwlwifi-Qu-b0-jf-b0-55.ucode
> -iwlwifi-Qu-b0-jf-b0-59.ucode
> -iwlwifi-Qu-c0-hr-b0-55.ucode
> -iwlwifi-Qu-c0-hr-b0-59.ucode
> -iwlwifi-Qu-c0-jf-b0-55.ucode
> -iwlwifi-Qu-c0-jf-b0-59.ucode
> -iwlwifi-QuZ-a0-hr-b0-55.ucode
> -iwlwifi-QuZ-a0-hr-b0-59.ucode
> -iwlwifi-QuZ-a0-jf-b0-55.ucode
> -iwlwifi-QuZ-a0-jf-b0-59.ucode
> -iwlwifi-cc-a0-55.ucode
> -iwlwifi-cc-a0-59.ucode
> -iwlwifi-ty-a0-gf-a0-59.ucode
> -tigon/tg3_tso.bin
> -zd1201.fw
> -zd1211/zd1211b_ub
> -zd1211/zd1211b_uphr
> -zd1211/zd1211b_ur
> -zd1211/zd1211_ub
> -zd1211/zd1211_uphr
> -zd1211/zd1211_ur
> diff --git a/debian/rules b/debian/rules
> index a2efe8f471d5..53c50c39719e 100755
> --- a/debian/rules
> +++ b/debian/rules
> @@ -27,8 +27,6 @@ dest_dir = $(CURDIR)/debian/linux-firmware
>  firm_dir = $(dest_dir)/lib/firmware
>  doc_dir = $(dest_dir)/usr/share/doc/linux-firmware
>  license_dir = $(doc_dir)/licenses
> -nic_firm_dir = $(CURDIR)/debian/nic-firmware/lib/firmware
> -scsi_firm_dir = $(CURDIR)/debian/scsi-firmware/lib/firmware
>  
>  install-indep: build-indep
>  	dh_testdir
> @@ -40,18 +38,6 @@ install-indep: build-indep
>  	make install DESTDIR=$(dest_dir)
>  	# debian/scripts/compress-firmware $(firm_dir)
>  
> -ifeq ($(filter noudeb,$(DEB_BUILD_PROFILES)),)
> -	for f in $$(cat debian/nic-firmware.lst); do \
> -		install -m644 -D $(firm_dir)/$$f $(nic_firm_dir)/$$f; \
> -	done
> -	# debian/scripts/compress-firmware $(nic_firm_dir)
> -
> -	for f in $$(cat debian/scsi-firmware.lst); do \
> -		install -m644 -D $(firm_dir)/$$f $(scsi_firm_dir)/$$f; \
> -	done
> -	# debian/scripts/compress-firmware $(scsi_firm_dir)
> -endif
> -
>  	install -d $(doc_dir)
>  	cp WHENCE $(doc_dir)/README
>  	cp WHENCE.ubuntu $(doc_dir)/README.ubuntu
> diff --git a/debian/scripts/list-udeb-updates b/debian/scripts/list-udeb-updates
> deleted file mode 100755
> index 838df476141f..000000000000
> --- a/debian/scripts/list-udeb-updates
> +++ /dev/null
> @@ -1,101 +0,0 @@
> -#!/bin/bash
> -#
> -# Compare firmware listed in debian/*.lst with the firmware files
> -# specified by modules in udebs for the specified kernel version.
> -# List files to be removed (i.e. files in debian/*.lst but not
> -# requested by udeb modules) and files to be added (i.e. files
> -# requested by udeb modules but not in debian/*.lst).
> -#
> -# The lists generated by this tool are not definitive, as some
> -# modules omit the firmware modinfo or put some less-than-current
> -# firmware version there. Exercise good judgement.
> -#
> -# Example usage:
> -#
> -#   $ debian/list-udeb-updates linux 4.4.0-13.29
> -#   $ debian/list-udeb-updates linux-lts-utopic 3.16.0-67.87~14.04.1
> -
> -shopt -s expand_aliases
> -alias errecho='>&2 echo'
> -
> -if [ $# -ne 2 ]; then
> -	errecho "Usage: $0 <source-pkg> <kernel-version>"
> -	exit 1
> -fi
> -
> -# Bail if the source package or version string isn't the format we expect
> -if ! (expr match "$1" '^linux$' &>/dev/null || expr match "$1" '^linux-hwe[a-z\-]*$' &>/dev/null ||
> -      expr match "$1" '^linux-[0-9]\+\.[0-9]\+$' &>/dev/null)
> -then
> -	errecho "Invalid source package $1"
> -	exit 1
> -fi
> -if ! expr match "$2" '\(^[0-9]\+\.[0-9]\+\.0-[0-9]\+\.[0-9.~]\+$\)' &>/dev/null
> -then
> -	errecho "Invalid version $2"
> -	exit 1
> -fi
> -VER=$(expr match "$2" '\(^[0-9]\+\.[0-9]\+\.0\)')
> -TMP=${2#"${VER}-"}
> -ABI=$(expr match "$TMP" '\([0-9]\+\)')
> -UPLOAD=$(expr match "$TMP" '[0-9]\+\.\([0-9.~]\+\)')
> -
> -TMPDIR=$(mktemp -d)
> -if [ $? -ne 0 ]; then
> -	echo "Error creating temporary directory"
> -	exit 1
> -fi
> -
> -function cleanup {
> -	rm -r "$TMPDIR"
> -}
> -trap cleanup EXIT
> -
> -UDEBS="kernel-image-${VER}-${ABI}-*_${VER}-${ABI}.${UPLOAD}_*.udeb"
> -UDEBS+=",nic-modules-${VER}-${ABI}-*_${VER}-${ABI}.${UPLOAD}_*.udeb"
> -UDEBS+=",nic-usb-modules-${VER}-${ABI}-*_${VER}-${ABI}.${UPLOAD}_*.udeb"
> -UDEBS+=",scsi-modules-${VER}-${ABI}-*_${VER}-${ABI}.${UPLOAD}_*.udeb"
> -mkdir "$TMPDIR/udebs"
> -if ! wget --quiet -r -l1 --no-parent -nd -P "$TMPDIR/udebs/" -A "$UDEBS" "http://archive.ubuntu.com/ubuntu/pool/main/l/$1/"
> -then
> -	errecho "Error downloading udebs for kernel version $VERSION"
> -	exit 1
> -fi
> -if ! wget --quiet -r -l1 --no-parent -nd -P "$TMPDIR/udebs/" -A "$UDEBS" "http://ports.ubuntu.com/pool/main/l/$1/"
> -then
> -	errecho "Error downloading udebs for kernel version $VERSION"
> -	exit 1
> -fi
> -
> -touch "$TMPDIR/fwlist.txt"
> -
> -for f in $TMPDIR/udebs/*.udeb; do
> -	dpkg -x "$f" "$TMPDIR/extract"
> -	modules=$(find "$TMPDIR/extract" -name '*.ko')
> -
> -	rm -f "$TMPDIR/fwlist.tmp"
> -	touch "$TMPDIR/fwlist.tmp"
> -	for m in $modules; do
> -		modinfo -F firmware $m >>"$TMPDIR/fwlist.tmp"
> -	done
> -
> -	cat "$TMPDIR/fwlist.txt" "$TMPDIR/fwlist.tmp" | sort | uniq >"$TMPDIR/fwlist.new"
> -	mv "$TMPDIR/fwlist.new" "$TMPDIR/fwlist.txt"
> -	rm -rf "$TMPDIR/extract"
> -done
> -
> -# Filter out any firmware files not actually in linux-firmware
> -find . -type f | sed 's/\.\///'|egrep -v "debian|\.git|WHENCE|LICEN" | sort >"$TMPDIR/fw-files.txt"
> -comm -12 "$TMPDIR/fw-files.txt" "$TMPDIR/fwlist.txt" >"$TMPDIR/fwlist.tmp"
> -mv "$TMPDIR/fwlist.tmp" "$TMPDIR/fwlist.txt"
> -
> -cat debian/*.lst | sort | uniq >"$TMPDIR/current-fw.txt"
> -
> -echo "Firmware to remove from udebs:"
> -echo ""
> -comm -23 "$TMPDIR/current-fw.txt" "$TMPDIR/fwlist.txt"
> -
> -echo ""
> -echo "Firmware to add to udebs:"
> -echo ""
> -comm -13 "$TMPDIR/current-fw.txt" "$TMPDIR/fwlist.txt"
> diff --git a/debian/scsi-firmware.lst b/debian/scsi-firmware.lst
> deleted file mode 100644
> index a8b762d275c0..000000000000
> --- a/debian/scsi-firmware.lst
> +++ /dev/null
> @@ -1,14 +0,0 @@
> -advansys/3550.bin
> -advansys/38C0800.bin
> -advansys/38C1600.bin
> -advansys/mcode.bin
> -ql2100_fw.bin
> -ql2200_fw.bin
> -ql2300_fw.bin
> -ql2322_fw.bin
> -ql2400_fw.bin
> -ql2500_fw.bin
> -qlogic/1040.bin
> -qlogic/12160.bin
> -qlogic/1280.bin
> -isci/isci_firmware.bin
diff mbox series

Patch

diff --git a/debian/control b/debian/control
index 932afc45a500..1590f9dfbd47 100644
--- a/debian/control
+++ b/debian/control
@@ -18,19 +18,3 @@  Replaces: atmel-firmware, linux-restricted-common, linux-firmware-snapdragon (<=
 Breaks: linux-firmware-snapdragon (<= 1.2-0ubuntu1), linux-firmware-raspi2 (<= 1.20190819-0ubuntu2)
 Description: Firmware for Linux kernel drivers
  This package provides firmware used by Linux kernel drivers.
-
-Package: nic-firmware
-Build-Profiles: <!noudeb>
-XC-Package-Type: udeb
-Architecture: all
-Section: debian-installer
-Description: Firmware for NICs
- This package contains firmware needed by some network controllers.
-
-Package: scsi-firmware
-Build-Profiles: <!noudeb>
-XC-Package-Type: udeb
-Architecture: all
-Section: debian-installer
-Description: Firmware for SCSI controllers
- This package contains firmware needed by some scsi controllers.
diff --git a/debian/nic-firmware.lst b/debian/nic-firmware.lst
deleted file mode 100644
index 36294962f826..000000000000
--- a/debian/nic-firmware.lst
+++ /dev/null
@@ -1,144 +0,0 @@ 
-3com/typhoon.bin
-adaptec/starfire_rx.bin
-adaptec/starfire_tx.bin
-agere_sta_fw.bin
-ath9k_htc/htc_7010-1.4.0.fw
-ath9k_htc/htc_9271-1.4.0.fw
-atmel_at76c504_2958.bin
-atmel_at76c504a_2958.bin
-brcm/bcm43xx-0.fw
-brcm/bcm43xx_hdr-0.fw
-brcm/brcmfmac43143.bin
-brcm/brcmfmac43143-sdio.bin
-brcm/brcmfmac43236b.bin
-brcm/brcmfmac43241b0-sdio.bin
-brcm/brcmfmac43241b4-sdio.bin
-brcm/brcmfmac43241b5-sdio.bin
-brcm/brcmfmac43242a.bin
-brcm/brcmfmac4329-sdio.bin
-brcm/brcmfmac4330-sdio.bin
-brcm/brcmfmac43340-sdio.bin
-brcm/brcmfmac4334-sdio.bin
-brcm/brcmfmac4335-sdio.bin
-brcm/brcmfmac43362-sdio.bin
-brcm/brcmfmac4339-sdio.bin
-brcm/brcmfmac43455-sdio.bin
-brcm/brcmfmac4350-pcie.bin
-brcm/brcmfmac4354-sdio.bin
-brcm/brcmfmac43430-sdio.bin
-brcm/brcmfmac43430a0-sdio.bin
-brcm/brcmfmac4350c2-pcie.bin
-brcm/brcmfmac43569.bin
-brcm/brcmfmac4356-pcie.bin
-brcm/brcmfmac4356-sdio.bin
-brcm/brcmfmac43570-pcie.bin
-brcm/brcmfmac4358-pcie.bin
-brcm/brcmfmac43602-pcie.bin
-brcm/brcmfmac4366b-pcie.bin
-brcm/brcmfmac4366c-pcie.bin
-brcm/brcmfmac4371-pcie.bin
-brcm/brcmfmac4373-sdio.bin
-brcm/brcmfmac4373.bin
-e100/d101m_ucode.bin
-e100/d101s_ucode.bin
-e100/d102e_ucode.bin
-hfi1_dc8051.fw
-hfi1_fabric.fw
-hfi1_pcie.fw
-hfi1_sbus.fw
-ipw2100-1.3.fw
-ipw2100-1.3-i.fw
-ipw2100-1.3-p.fw
-ipw2200-bss.fw
-ipw2200-ibss.fw
-ipw2200-sniffer.fw
-rt2561.bin
-rt2561s.bin
-rt2661.bin
-rt2860.bin
-rt2870.bin
-rt73.bin
-rtl_nic/rtl8411-1.fw
-rtl_nic/rtl8411-2.fw
-rtl_nic/rtl8106e-1.fw
-rtl_nic/rtl8106e-2.fw
-rtl_nic/rtl8107e-1.fw
-rtl_nic/rtl8107e-2.fw
-rtl_nic/rtl8125a-3.fw
-rtl_nic/rtl8125b-2.fw
-rtl_nic/rtl8153a-2.fw
-rtl_nic/rtl8153a-3.fw
-rtl_nic/rtl8153a-4.fw
-rtl_nic/rtl8153b-2.fw
-rtl_nic/rtl8168fp-3.fw
-rtl_nic/rtl8168e-2.fw
-rtl_nic/rtl8168d-2.fw
-rtl_nic/rtl8105e-1.fw
-rtl_nic/rtl8168e-3.fw
-rtl_nic/rtl8168d-1.fw
-rtl_nic/rtl8168e-1.fw
-rtl_nic/rtl8168f-2.fw
-rtl_nic/rtl8168f-1.fw
-rtl_nic/rtl8168g-2.fw
-rtl_nic/rtl8168g-3.fw
-rtl_nic/rtl8168h-1.fw
-rtl_nic/rtl8168h-2.fw
-rtl_nic/rtl8402-1.fw
-sun/cassini.bin
-tigon/tg3.bin
-tigon/tg3_tso5.bin
-bnx2/bnx2-mips-06-6.2.3.fw
-bnx2/bnx2-mips-09-6.2.1b.fw
-bnx2/bnx2-rv2p-06-6.0.15.fw
-bnx2/bnx2-rv2p-09ax-6.0.17.fw
-bnx2/bnx2-rv2p-09-6.0.17.fw
-bnx2x/bnx2x-e1-7.13.15.0.fw
-bnx2x/bnx2x-e1h-7.13.15.0.fw
-bnx2x/bnx2x-e2-7.13.15.0.fw
-phanfw.bin
-iwlwifi-1000-5.ucode
-iwlwifi-100-5.ucode
-iwlwifi-105-6.ucode
-iwlwifi-135-6.ucode
-iwlwifi-2000-6.ucode
-iwlwifi-2030-6.ucode
-iwlwifi-3160-17.ucode
-iwlwifi-3168-29.ucode
-iwlwifi-3945-2.ucode
-iwlwifi-4965-2.ucode
-iwlwifi-5000-5.ucode
-iwlwifi-5150-2.ucode
-iwlwifi-6000-4.ucode
-iwlwifi-6000g2a-6.ucode
-iwlwifi-6000g2b-6.ucode
-iwlwifi-6050-5.ucode
-iwlwifi-7260-17.ucode
-iwlwifi-7265-17.ucode
-iwlwifi-7265D-29.ucode
-iwlwifi-8000C-36.ucode
-iwlwifi-8265-36.ucode
-iwlwifi-9000-pu-b0-jf-b0-46.ucode
-iwlwifi-9260-th-b0-jf-b0-46.ucode
-iwlwifi-Qu-b0-hr-b0-55.ucode
-iwlwifi-Qu-b0-hr-b0-59.ucode
-iwlwifi-Qu-b0-jf-b0-55.ucode
-iwlwifi-Qu-b0-jf-b0-59.ucode
-iwlwifi-Qu-c0-hr-b0-55.ucode
-iwlwifi-Qu-c0-hr-b0-59.ucode
-iwlwifi-Qu-c0-jf-b0-55.ucode
-iwlwifi-Qu-c0-jf-b0-59.ucode
-iwlwifi-QuZ-a0-hr-b0-55.ucode
-iwlwifi-QuZ-a0-hr-b0-59.ucode
-iwlwifi-QuZ-a0-jf-b0-55.ucode
-iwlwifi-QuZ-a0-jf-b0-59.ucode
-iwlwifi-cc-a0-55.ucode
-iwlwifi-cc-a0-59.ucode
-iwlwifi-ty-a0-gf-a0-59.ucode
-tigon/tg3_tso.bin
-zd1201.fw
-zd1211/zd1211b_ub
-zd1211/zd1211b_uphr
-zd1211/zd1211b_ur
-zd1211/zd1211_ub
-zd1211/zd1211_uphr
-zd1211/zd1211_ur
diff --git a/debian/rules b/debian/rules
index a2efe8f471d5..53c50c39719e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,8 +27,6 @@  dest_dir = $(CURDIR)/debian/linux-firmware
 firm_dir = $(dest_dir)/lib/firmware
 doc_dir = $(dest_dir)/usr/share/doc/linux-firmware
 license_dir = $(doc_dir)/licenses
-nic_firm_dir = $(CURDIR)/debian/nic-firmware/lib/firmware
-scsi_firm_dir = $(CURDIR)/debian/scsi-firmware/lib/firmware
 
 install-indep: build-indep
 	dh_testdir
@@ -40,18 +38,6 @@  install-indep: build-indep
 	make install DESTDIR=$(dest_dir)
 	# debian/scripts/compress-firmware $(firm_dir)
 
-ifeq ($(filter noudeb,$(DEB_BUILD_PROFILES)),)
-	for f in $$(cat debian/nic-firmware.lst); do \
-		install -m644 -D $(firm_dir)/$$f $(nic_firm_dir)/$$f; \
-	done
-	# debian/scripts/compress-firmware $(nic_firm_dir)
-
-	for f in $$(cat debian/scsi-firmware.lst); do \
-		install -m644 -D $(firm_dir)/$$f $(scsi_firm_dir)/$$f; \
-	done
-	# debian/scripts/compress-firmware $(scsi_firm_dir)
-endif
-
 	install -d $(doc_dir)
 	cp WHENCE $(doc_dir)/README
 	cp WHENCE.ubuntu $(doc_dir)/README.ubuntu
diff --git a/debian/scripts/list-udeb-updates b/debian/scripts/list-udeb-updates
deleted file mode 100755
index 838df476141f..000000000000
--- a/debian/scripts/list-udeb-updates
+++ /dev/null
@@ -1,101 +0,0 @@ 
-#!/bin/bash
-#
-# Compare firmware listed in debian/*.lst with the firmware files
-# specified by modules in udebs for the specified kernel version.
-# List files to be removed (i.e. files in debian/*.lst but not
-# requested by udeb modules) and files to be added (i.e. files
-# requested by udeb modules but not in debian/*.lst).
-#
-# The lists generated by this tool are not definitive, as some
-# modules omit the firmware modinfo or put some less-than-current
-# firmware version there. Exercise good judgement.
-#
-# Example usage:
-#
-#   $ debian/list-udeb-updates linux 4.4.0-13.29
-#   $ debian/list-udeb-updates linux-lts-utopic 3.16.0-67.87~14.04.1
-
-shopt -s expand_aliases
-alias errecho='>&2 echo'
-
-if [ $# -ne 2 ]; then
-	errecho "Usage: $0 <source-pkg> <kernel-version>"
-	exit 1
-fi
-
-# Bail if the source package or version string isn't the format we expect
-if ! (expr match "$1" '^linux$' &>/dev/null || expr match "$1" '^linux-hwe[a-z\-]*$' &>/dev/null ||
-      expr match "$1" '^linux-[0-9]\+\.[0-9]\+$' &>/dev/null)
-then
-	errecho "Invalid source package $1"
-	exit 1
-fi
-if ! expr match "$2" '\(^[0-9]\+\.[0-9]\+\.0-[0-9]\+\.[0-9.~]\+$\)' &>/dev/null
-then
-	errecho "Invalid version $2"
-	exit 1
-fi
-VER=$(expr match "$2" '\(^[0-9]\+\.[0-9]\+\.0\)')
-TMP=${2#"${VER}-"}
-ABI=$(expr match "$TMP" '\([0-9]\+\)')
-UPLOAD=$(expr match "$TMP" '[0-9]\+\.\([0-9.~]\+\)')
-
-TMPDIR=$(mktemp -d)
-if [ $? -ne 0 ]; then
-	echo "Error creating temporary directory"
-	exit 1
-fi
-
-function cleanup {
-	rm -r "$TMPDIR"
-}
-trap cleanup EXIT
-
-UDEBS="kernel-image-${VER}-${ABI}-*_${VER}-${ABI}.${UPLOAD}_*.udeb"
-UDEBS+=",nic-modules-${VER}-${ABI}-*_${VER}-${ABI}.${UPLOAD}_*.udeb"
-UDEBS+=",nic-usb-modules-${VER}-${ABI}-*_${VER}-${ABI}.${UPLOAD}_*.udeb"
-UDEBS+=",scsi-modules-${VER}-${ABI}-*_${VER}-${ABI}.${UPLOAD}_*.udeb"
-mkdir "$TMPDIR/udebs"
-if ! wget --quiet -r -l1 --no-parent -nd -P "$TMPDIR/udebs/" -A "$UDEBS" "http://archive.ubuntu.com/ubuntu/pool/main/l/$1/"
-then
-	errecho "Error downloading udebs for kernel version $VERSION"
-	exit 1
-fi
-if ! wget --quiet -r -l1 --no-parent -nd -P "$TMPDIR/udebs/" -A "$UDEBS" "http://ports.ubuntu.com/pool/main/l/$1/"
-then
-	errecho "Error downloading udebs for kernel version $VERSION"
-	exit 1
-fi
-
-touch "$TMPDIR/fwlist.txt"
-
-for f in $TMPDIR/udebs/*.udeb; do
-	dpkg -x "$f" "$TMPDIR/extract"
-	modules=$(find "$TMPDIR/extract" -name '*.ko')
-
-	rm -f "$TMPDIR/fwlist.tmp"
-	touch "$TMPDIR/fwlist.tmp"
-	for m in $modules; do
-		modinfo -F firmware $m >>"$TMPDIR/fwlist.tmp"
-	done
-
-	cat "$TMPDIR/fwlist.txt" "$TMPDIR/fwlist.tmp" | sort | uniq >"$TMPDIR/fwlist.new"
-	mv "$TMPDIR/fwlist.new" "$TMPDIR/fwlist.txt"
-	rm -rf "$TMPDIR/extract"
-done
-
-# Filter out any firmware files not actually in linux-firmware
-find . -type f | sed 's/\.\///'|egrep -v "debian|\.git|WHENCE|LICEN" | sort >"$TMPDIR/fw-files.txt"
-comm -12 "$TMPDIR/fw-files.txt" "$TMPDIR/fwlist.txt" >"$TMPDIR/fwlist.tmp"
-mv "$TMPDIR/fwlist.tmp" "$TMPDIR/fwlist.txt"
-
-cat debian/*.lst | sort | uniq >"$TMPDIR/current-fw.txt"
-
-echo "Firmware to remove from udebs:"
-echo ""
-comm -23 "$TMPDIR/current-fw.txt" "$TMPDIR/fwlist.txt"
-
-echo ""
-echo "Firmware to add to udebs:"
-echo ""
-comm -13 "$TMPDIR/current-fw.txt" "$TMPDIR/fwlist.txt"
diff --git a/debian/scsi-firmware.lst b/debian/scsi-firmware.lst
deleted file mode 100644
index a8b762d275c0..000000000000
--- a/debian/scsi-firmware.lst
+++ /dev/null
@@ -1,14 +0,0 @@ 
-advansys/3550.bin
-advansys/38C0800.bin
-advansys/38C1600.bin
-advansys/mcode.bin
-ql2100_fw.bin
-ql2200_fw.bin
-ql2300_fw.bin
-ql2322_fw.bin
-ql2400_fw.bin
-ql2500_fw.bin
-qlogic/1040.bin
-qlogic/12160.bin
-qlogic/1280.bin
-isci/isci_firmware.bin