diff --git a/linux-firmware.spec b/linux-firmware.spec
index aca8c93..1ecb54f 100644
--- a/linux-firmware.spec
+++ b/linux-firmware.spec
@@ -1,11 +1,11 @@
%global debug_package %{nil}
-%global firmware_release 112
+%global firmware_release 113
%global _firmwarepath /usr/lib/firmware
%define _binaries_in_noarch_packages_terminate_build 0
Name: linux-firmware
-Version: 20200918
+Version: 20201022
Release: %{firmware_release}%{?dist}
Summary: Firmware files used by the Linux kernel
License: GPL+ and GPLv2+ and MIT and Redistributable, no modification permitted
@@ -17,6 +17,7 @@ Source0: https://www.kernel.org/pub/linux/kernel/firmware/%{name}-%{version}.tar
Patch1: 0001-brcm-Raspberry-Pi-3A-WiFi-NVRAM-support.patch
Patch2: 0002-brcm-Raspberry-Pi-Update-ccode-to-X2.patch
+BuildRequires: make
Requires: linux-firmware-whence
Provides: kernel-firmware = %{version} xorg-x11-drv-ati-firmware = 7.0
Obsoletes: kernel-firmware < %{version} xorg-x11-drv-ati-firmware < 6.13.0-0.22
@@ -31,7 +32,6 @@ Obsoletes: rt61pci-firmware < 1.2-11
Obsoletes: rt73usb-firmware < 1.8-11
Obsoletes: cx18-firmware < 20080628-10
Conflicts: microcode_ctl < 2.1-0
-BuildRequires: git-core make
%description
This package includes firmware files required for some devices to
@@ -285,17 +285,7 @@ Requires: linux-firmware-whence
Firmware for Netronome Smart NICs
%prep
-%setup -q
-
-git init .
-if [ -z "$GIT_COMMITTER_NAME" ]; then
- git config user.email "nobody@fedoraproject.org"
- git config user.name "Fedora linux-firmware packagers"
-fi
-git add .
-git commit -m init .
-
-git am %{patches}
+%autosetup -p1
%build
@@ -323,10 +313,10 @@ rm -f usbdux/*dux */*.asm
# No need to install old firmware versions where we also provide newer versions
# which are preferred and support the same (or more) hardware
rm -f libertas/sd8686_v8*
-rm -f libertas/usb8388_v5.bin
+rm -f libertas/usb8388_v5.bin*
# Remove firmware for Creative CA0132 HD as it's in alsa-firmware
-rm -f ctefx.bin ctspeq.bin
+rm -f ctefx.bin* ctspeq.bin*
# Remove superfluous infra files
rm -f check_whence.py configure Makefile README
@@ -363,86 +353,87 @@ sed -e 's/^/%%dir /' linux-firmware.dirs >> linux-firmware.files
%files -n iwl100-firmware
%license LICENCE.iwlwifi_firmware
-%{_firmwarepath}/iwlwifi-100-5.ucode
+%{_firmwarepath}/iwlwifi-100-5.ucode*
%files -n iwl105-firmware
%license LICENCE.iwlwifi_firmware
-%{_firmwarepath}/iwlwifi-105-*.ucode
+%{_firmwarepath}/iwlwifi-105-*.ucode*
%files -n iwl135-firmware
%license LICENCE.iwlwifi_firmware
-%{_firmwarepath}/iwlwifi-135-*.ucode
+%{_firmwarepath}/iwlwifi-135-*.ucode*
%files -n iwl1000-firmware
%license LICENCE.iwlwifi_firmware
-%{_firmwarepath}/iwlwifi-1000-*.ucode
+%{_firmwarepath}/iwlwifi-1000-*.ucode*
%files -n iwl2000-firmware
%license LICENCE.iwlwifi_firmware
-%{_firmwarepath}/iwlwifi-2000-*.ucode
+%{_firmwarepath}/iwlwifi-2000-*.ucode*
%files -n iwl2030-firmware
%license LICENCE.iwlwifi_firmware
-%{_firmwarepath}/iwlwifi-2030-*.ucode
+%{_firmwarepath}/iwlwifi-2030-*.ucode*
%files -n iwl3160-firmware
%license LICENCE.iwlwifi_firmware
-%{_firmwarepath}/iwlwifi-3160-*.ucode
-%{_firmwarepath}/iwlwifi-3168-*.ucode
+%{_firmwarepath}/iwlwifi-3160-*.ucode*
+%{_firmwarepath}/iwlwifi-3168-*.ucode*
%files -n iwl3945-firmware
%license LICENCE.iwlwifi_firmware
-%{_firmwarepath}/iwlwifi-3945-*.ucode
+%{_firmwarepath}/iwlwifi-3945-*.ucode*
%files -n iwl4965-firmware
%license LICENCE.iwlwifi_firmware
-%{_firmwarepath}/iwlwifi-4965-*.ucode
+%{_firmwarepath}/iwlwifi-4965-*.ucode*
%files -n iwl5000-firmware
%license LICENCE.iwlwifi_firmware
-%{_firmwarepath}/iwlwifi-5000-*.ucode
+%{_firmwarepath}/iwlwifi-5000-*.ucode*
%files -n iwl5150-firmware
%license LICENCE.iwlwifi_firmware
-%{_firmwarepath}/iwlwifi-5150-*.ucode
+%{_firmwarepath}/iwlwifi-5150-*.ucode*
%files -n iwl6000-firmware
%license LICENCE.iwlwifi_firmware
-%{_firmwarepath}/iwlwifi-6000-*.ucode
+%{_firmwarepath}/iwlwifi-6000-*.ucode*
%files -n iwl6000g2a-firmware
%license LICENCE.iwlwifi_firmware
-%{_firmwarepath}/iwlwifi-6000g2a-*.ucode
+%{_firmwarepath}/iwlwifi-6000g2a-*.ucode*
%files -n iwl6000g2b-firmware
%license LICENCE.iwlwifi_firmware
-%{_firmwarepath}/iwlwifi-6000g2b-*.ucode
+%{_firmwarepath}/iwlwifi-6000g2b-*.ucode*
%files -n iwl6050-firmware
%license LICENCE.iwlwifi_firmware
-%{_firmwarepath}/iwlwifi-6050-*.ucode
+%{_firmwarepath}/iwlwifi-6050-*.ucode*
%files -n iwl7260-firmware
%license LICENCE.iwlwifi_firmware
-%{_firmwarepath}/iwlwifi-7260-*.ucode
-%{_firmwarepath}/iwlwifi-7265-*.ucode
-%{_firmwarepath}/iwlwifi-7265D-*.ucode
-%{_firmwarepath}/iwlwifi-8000C-*.ucode
-%{_firmwarepath}/iwlwifi-8265-*.ucode
-%{_firmwarepath}/iwlwifi-9000-*.ucode
-%{_firmwarepath}/iwlwifi-9260-*.ucode
-%{_firmwarepath}/iwlwifi-cc-a0-*.ucode
-%{_firmwarepath}/iwlwifi-Qu*.ucode
+%{_firmwarepath}/iwlwifi-7260-*.ucode*
+%{_firmwarepath}/iwlwifi-7265-*.ucode*
+%{_firmwarepath}/iwlwifi-7265D-*.ucode*
+%{_firmwarepath}/iwlwifi-8000C-*.ucode*
+%{_firmwarepath}/iwlwifi-8265-*.ucode*
+%{_firmwarepath}/iwlwifi-9000-*.ucode*
+%{_firmwarepath}/iwlwifi-9260-*.ucode*
+%{_firmwarepath}/iwlwifi-cc-a0-*.ucode*
+%{_firmwarepath}/iwlwifi-Qu*.ucode*
+%{_firmwarepath}/iwlwifi-ty-a0-gf-a0-59.ucode*
%files -n libertas-usb8388-firmware
%license LICENCE.Marvell
%dir %{_firmwarepath}/libertas
-%{_firmwarepath}/libertas/usb8388_v9.bin
+%{_firmwarepath}/libertas/usb8388_v9.bin*
%files -n libertas-usb8388-olpc-firmware
%license LICENCE.Marvell
%dir %{_firmwarepath}/libertas
-%{_firmwarepath}/libertas/usb8388_olpc.bin
+%{_firmwarepath}/libertas/usb8388_olpc.bin*
%files -n libertas-sd8686-firmware
%license LICENCE.Marvell
@@ -465,6 +456,26 @@ sed -e 's/^/%%dir /' linux-firmware.dirs >> linux-firmware.files
%{_firmwarepath}/netronome/*
%changelog
+* Fri Oct 23 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 20201022-113
+- Update to upstream 20201023 release
+- All symlinks created using WHENCE links option
+- Update Marvell Switchdev firmware with ABI changes
+- Mellanox: Add new mlxsw_spectrum firmware xx.2008.1312
+- Cadence MHDP8546 DP bridge
+- Intel Bluetooth updates for: 7265(D1)
+- iwlwifi: update 3168, 7265D, 8000C, 8265, core56-54 firmwares
+- QCA WCN3991 updates
+- TI VPDMA 1b8.bin firmware
+- amdgpu: navi10/12/14/picasso/raven/renoir/vega10/12/20 update to 20.40
+- ice: add comms for Intel E800 series driver, firmware to 1.3.16.0
+- qcom : updated venus firmware
+- i915: Add DG1 DMC v2.02
+- mediatek: VPU: separate venc service
+- ath10k: add SDIO firmware for QCA9377 WiFi
+- rtl_bt: Update RTL8821C BT FW to 0xAA6C_A99E
+- cypress: add Cypress firmware and clm_blob files for:
+ 43012, 43340, 43362, 4339, 43430, 43455, 4354, 4356, 43570, 4373, 54591
+
* Fri Sep 18 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 20200918-112
- amdgpu firmware for 20.30: navi10/12
- wl18xx: update firmware file 8.9.0.0.83
diff --git a/sources b/sources
index dc380ed..704ffa4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (linux-firmware-20200918.tar.xz) = c257bb40d7c4746e50f3733928c992017d57e3fac641bc63ea41754de50c5adb05ba1629e750b3943cc28e5d19ae709e5cdd3fbbe9ea35563bc68707e0e98e80
+SHA512 (linux-firmware-20201022.tar.xz) = d502000154483d4aa8274f851749c1da550f3e94152ae950c93b3577af72e8864b1884938b7b02c4ea832af4b3060bccea10fdee4cd1dd83cb3ca8edcbf2995e