- updated to 20220815

diff --git a/linux-firmware.spec b/linux-firmware.spec
index a917411594e3e8d500337682159c07cec1cded28..cb9587920ae75ea1db76c5a69c6e07ee14932622 100644 (file)
--- a/linux-firmware.spec
+++ b/linux-firmware.spec
@@ -1,5 +1,5 @@
 %define                rel     1
 %define                rel     1

-%define                ver     20201022
+%define                ver     20220815

 Summary:       Firmware files used by the Linux kernel
 Summary(pl.UTF-8):     Pliki firmware'u używane przez jądro Linuksa
 Name:          linux-firmware
 Summary:       Firmware files used by the Linux kernel
 Summary(pl.UTF-8):     Pliki firmware'u używane przez jądro Linuksa
 Name:          linux-firmware


@@ -10,8 +10,8 @@ Group:                Base/Kernel
 # in case git snapshot is needed
 #Source0:      https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/%{name}-%{version}.tar.gz
 # upstream tarball
 # in case git snapshot is needed
 #Source0:      https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/%{name}-%{version}.tar.gz
 # upstream tarball

-Source0:       https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/%{name}-%{version}.tar.xz
-# Source0-md5: 519f94454c9bb2274daef6540d5e3cc2
+Source0:       https://www.kernel.org/pub/linux/kernel/firmware/%{name}-%{version}.tar.xz
+# Source0-md5: a10fae34e085810817822110d05aeb75

 URL:           https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/
 BuildRequires: tar >= 1:1.22
 BuildRequires: xz
 URL:           https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/
 BuildRequires: tar >= 1:1.22
 BuildRequires: xz


@@ -20,6 +20,10 @@ Requires:    microcode-data-intel
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 

+%define                no_install_post_strip   1
+%define                _enable_debug_packages  0
+%define                _noautochrpath          .*/lib/firmware/.*
+

 %description
 This package includes firmware files required for some devices to
 operate.
 %description
 This package includes firmware files required for some devices to
 operate.


@@ -166,25 +170,14 @@ drivers for Linux to support the iwl2030 hardware. Usage of the
 firmware is subject to the terms and conditions contained inside the
 provided LICENSE file. Please read it carefully.
 
 firmware is subject to the terms and conditions contained inside the
 provided LICENSE file. Please read it carefully.
 

-%package -n iwl22000-firmware
-Summary:       Firmware for Intel(R) Centrino Wireless-N 22000 Series Adapters
+%package -n iwlax2xx-firmware
+Summary:       Firmware for Intel(R) AX200/AX201/AX210/AX211

 License:       Redistributable, no modification permitted
 Group:         Base/Kernel
 
 License:       Redistributable, no modification permitted
 Group:         Base/Kernel
 

-%description -n iwl22000-firmware
+%description -n iwlax2xx-firmware

 This package contains the firmware required by the Intel wireless
 This package contains the firmware required by the Intel wireless

-drivers for Linux to support the iwl22000 hardware. Usage of the
-firmware is subject to the terms and conditions contained inside the
-provided LICENSE file. Please read it carefully.
-
-%package -n iwl22260-firmware
-Summary:       Firmware for Intel(R) Centrino Wireless-N 22260 Series Adapters
-License:       Redistributable, no modification permitted
-Group:         Base/Kernel
-
-%description -n iwl22260-firmware
-This package contains the firmware required by the Intel wireless
-drivers for Linux to support the iwl22260 hardware. Usage of the
+drivers for Linux to support the iwlax2xx hardware. Usage of the

 firmware is subject to the terms and conditions contained inside the
 provided LICENSE file. Please read it carefully.
 
 firmware is subject to the terms and conditions contained inside the
 provided LICENSE file. Please read it carefully.
 


@@ -346,6 +339,14 @@ Group:             Base/Kernel
 %description -n libertas-firmware
 Firmware for Marvell wireless network cards
 
 %description -n libertas-firmware
 Firmware for Marvell wireless network cards
 

+%package -n microcode-data-amd
+Summary:       Microcode definitions for AMD64 processors
+License:       Redistributable, no modification permitted
+Group:         Base/Kernel
+
+%description -n microcode-data-amd
+Microcode definitions for AMD64 processors
+

 %package -n netronome-firmware
 Summary:       Firmware for Netronome Smart NICs
 License:       Redistributable, no modification permitted
 %package -n netronome-firmware
 Summary:       Firmware for Netronome Smart NICs
 License:       Redistributable, no modification permitted


@@ -395,9 +396,7 @@ rmdir linux-firmware-*
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/lib/firmware
 cp -a . $RPM_BUILD_ROOT/lib/firmware
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/lib/firmware
 cp -a . $RPM_BUILD_ROOT/lib/firmware

-%{__rm} $RPM_BUILD_ROOT/lib/firmware/{GPL-2,GPL-3,LICENCE.*,LICENSE.*,README,TDA7706_OM_v*_boot.txt,WHENCE,check_whence.py}
-# For AMD CPU microcode see microcode-data-amd.spec
-%{__rm} -r $RPM_BUILD_ROOT/lib/firmware/amd-ucode
+%{__rm} $RPM_BUILD_ROOT/lib/firmware/{GPL-2,GPL-3,LICENCE.*,LICENSE.*,README,WHENCE,check_whence.py}

 # Symlink for ice package required by firmware and kernel driver
 ln -s $(basename $RPM_BUILD_ROOT/lib/firmware/intel/ice/ddp/ice-*.pkg) $RPM_BUILD_ROOT/lib/firmware/intel/ice/ddp/ice.pkg
 
 # Symlink for ice package required by firmware and kernel driver
 ln -s $(basename $RPM_BUILD_ROOT/lib/firmware/intel/ice/ddp/ice-*.pkg) $RPM_BUILD_ROOT/lib/firmware/intel/ice/ddp/ice.pkg
 


@@ -406,23 +405,25 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
 
 %files
 %defattr(644,root,root,755)

-%doc WHENCE LICENCE.* LICENSE.* README TDA7706_OM_v*_boot.txt
+%doc WHENCE LICENCE.* LICENSE.* README

 /lib/firmware/3com
 /lib/firmware/acenic
 /lib/firmware/adaptec
 /lib/firmware/advansys
 /lib/firmware/agere_*_fw.bin
 /lib/firmware/amd
 /lib/firmware/3com
 /lib/firmware/acenic
 /lib/firmware/adaptec
 /lib/firmware/advansys
 /lib/firmware/agere_*_fw.bin
 /lib/firmware/amd

+/lib/firmware/amphion

 /lib/firmware/as102_data1_st.hex
 /lib/firmware/as102_data2_st.hex
 /lib/firmware/atmel
 /lib/firmware/as102_data1_st.hex
 /lib/firmware/as102_data2_st.hex
 /lib/firmware/atmel

-/lib/firmware/atmsar11.fw

 /lib/firmware/atusb
 /lib/firmware/av7110
 /lib/firmware/carl9170-1.fw
 /lib/firmware/cadence
 /lib/firmware/atusb
 /lib/firmware/av7110
 /lib/firmware/carl9170-1.fw
 /lib/firmware/cadence

+/lib/firmware/cirrus

 /lib/firmware/cis
 /lib/firmware/cmmb_*_12mhz.inp
 /lib/firmware/cis
 /lib/firmware/cmmb_*_12mhz.inp

+/lib/firmware/cnm

 /lib/firmware/cpia2
 /lib/firmware/ctefx.bin
 /lib/firmware/ctspeq.bin
 /lib/firmware/cpia2
 /lib/firmware/ctefx.bin
 /lib/firmware/ctspeq.bin


@@ -452,15 +453,12 @@ rm -rf $RPM_BUILD_ROOT
 /lib/firmware/hfi1_sbus.fw
 /lib/firmware/htc_7010.fw
 /lib/firmware/htc_9271.fw
 /lib/firmware/hfi1_sbus.fw
 /lib/firmware/htc_7010.fw
 /lib/firmware/htc_9271.fw

-/lib/firmware/i2400m-fw-usb-*.sbcf
-/lib/firmware/i6050-fw-usb-*.sbcf

 /lib/firmware/i915
 /lib/firmware/imx
 /lib/firmware/inside-secure
 %dir /lib/firmware/intel
 /lib/firmware/intel/ice
 /lib/firmware/intel/irci_irci_ecr-master_20161208_0213_20170112_1500.bin
 /lib/firmware/i915
 /lib/firmware/imx
 /lib/firmware/inside-secure
 %dir /lib/firmware/intel
 /lib/firmware/intel/ice
 /lib/firmware/intel/irci_irci_ecr-master_20161208_0213_20170112_1500.bin

-/lib/firmware/intelliport2.bin

 /lib/firmware/isci
 /lib/firmware/isdbt_*.inp
 /lib/firmware/kaweth
 /lib/firmware/isci
 /lib/firmware/isdbt_*.inp
 /lib/firmware/kaweth


@@ -469,6 +467,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir /lib/firmware/korg
 /lib/firmware/korg/k1212.dsp
 /lib/firmware/lgs8g75.fw
 %dir /lib/firmware/korg
 /lib/firmware/korg/k1212.dsp
 /lib/firmware/lgs8g75.fw

+/lib/firmware/lt9611uxc_fw.bin

 /lib/firmware/matrox
 /lib/firmware/mediatek
 /lib/firmware/mellanox
 /lib/firmware/matrox
 /lib/firmware/mediatek
 /lib/firmware/mellanox


@@ -512,6 +511,7 @@ rm -rf $RPM_BUILD_ROOT
 /lib/firmware/rtl_nic
 /lib/firmware/rtlwifi
 /lib/firmware/rtw88
 /lib/firmware/rtl_nic
 /lib/firmware/rtlwifi
 /lib/firmware/rtw88

+/lib/firmware/rtw89

 /lib/firmware/s5p-mfc.fw
 /lib/firmware/s5p-mfc-v6.fw
 /lib/firmware/s5p-mfc-v6-v2.fw
 /lib/firmware/s5p-mfc.fw
 /lib/firmware/s5p-mfc-v6.fw
 /lib/firmware/s5p-mfc-v6-v2.fw


@@ -530,12 +530,12 @@ rm -rf $RPM_BUILD_ROOT
 /lib/firmware/sxg
 /lib/firmware/tdmb_nova_12mhz.inp
 /lib/firmware/tehuti
 /lib/firmware/sxg
 /lib/firmware/tdmb_nova_12mhz.inp
 /lib/firmware/tehuti

+/lib/firmware/ti

 /lib/firmware/ti_3410.fw
 /lib/firmware/ti_5052.fw
 /lib/firmware/tigon
 /lib/firmware/ti-keystone
 /lib/firmware/tlg2300_firmware.bin
 /lib/firmware/ti_3410.fw
 /lib/firmware/ti_5052.fw
 /lib/firmware/tigon
 /lib/firmware/ti-keystone
 /lib/firmware/tlg2300_firmware.bin

-/lib/firmware/tr_smctr.bin

 /lib/firmware/ttusb-budget
 /lib/firmware/ueagle-atm
 /lib/firmware/usbdux*_firmware.bin
 /lib/firmware/ttusb-budget
 /lib/firmware/ueagle-atm
 /lib/firmware/usbdux*_firmware.bin


@@ -543,6 +543,7 @@ rm -rf $RPM_BUILD_ROOT
 /lib/firmware/vicam
 /lib/firmware/vntwusb.fw
 /lib/firmware/vxge
 /lib/firmware/vicam
 /lib/firmware/vntwusb.fw
 /lib/firmware/vxge

+/lib/firmware/wfx

 /lib/firmware/whiteheat*.fw
 /lib/firmware/wil6210.brd
 /lib/firmware/wil6210.fw
 /lib/firmware/whiteheat*.fw
 /lib/firmware/wil6210.brd
 /lib/firmware/wil6210.fw


@@ -563,13 +564,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n atheros-firmware
 %defattr(644,root,root,755)
 
 %files -n atheros-firmware
 %defattr(644,root,root,755)

-%doc WHENCE LICENCE.atheros_firmware
+%doc WHENCE LICENCE.atheros_firmware LICENSE.QualcommAtheros_ar3k LICENSE.QualcommAtheros_ath10k

 /lib/firmware/ar3k
 /lib/firmware/ar5523.bin
 /lib/firmware/ar7010*.fw
 /lib/firmware/ar9170-*.fw
 /lib/firmware/ar9271.fw
 /lib/firmware/ath10k
 /lib/firmware/ar3k
 /lib/firmware/ar5523.bin
 /lib/firmware/ar7010*.fw
 /lib/firmware/ar9170-*.fw
 /lib/firmware/ar9271.fw
 /lib/firmware/ath10k

+/lib/firmware/ath11k

 /lib/firmware/ath3k-1.fw
 /lib/firmware/ath6k
 /lib/firmware/ath9k_htc
 /lib/firmware/ath3k-1.fw
 /lib/firmware/ath6k
 /lib/firmware/ath9k_htc


@@ -583,8 +585,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc WHENCE
 /lib/firmware/bnx2x
 %defattr(644,root,root,755)
 %doc WHENCE
 /lib/firmware/bnx2x

-/lib/firmware/bnx2x-e1-*.fw
-/lib/firmware/bnx2x-e1h-*.fw

 
 %files -n brcm-firmware
 %defattr(644,root,root,755)
 
 %files -n brcm-firmware
 %defattr(644,root,root,755)


@@ -647,16 +647,15 @@ rm -rf $RPM_BUILD_ROOT
 %doc WHENCE LICENCE.iwlwifi_firmware
 /lib/firmware/iwlwifi-2030-*.ucode
 
 %doc WHENCE LICENCE.iwlwifi_firmware
 /lib/firmware/iwlwifi-2030-*.ucode
 

-%files -n iwl22000-firmware
+%files -n iwlax2xx-firmware

 %defattr(644,root,root,755)
 %doc WHENCE LICENCE.iwlwifi_firmware
 /lib/firmware/iwlwifi-Qu-*.ucode
 /lib/firmware/iwlwifi-QuZ-*.ucode
 %defattr(644,root,root,755)
 %doc WHENCE LICENCE.iwlwifi_firmware
 /lib/firmware/iwlwifi-Qu-*.ucode
 /lib/firmware/iwlwifi-QuZ-*.ucode

-
-%files -n iwl22260-firmware
-%defattr(644,root,root,755)
-%doc WHENCE LICENCE.iwlwifi_firmware

 /lib/firmware/iwlwifi-cc-*.ucode
 /lib/firmware/iwlwifi-cc-*.ucode

+/lib/firmware/iwlwifi-so-*.pnvm
+/lib/firmware/iwlwifi-so-*.ucode
+/lib/firmware/iwlwifi-ty-*.pnvm

 /lib/firmware/iwlwifi-ty-*.ucode
 
 %files -n iwl3160-firmware
 /lib/firmware/iwlwifi-ty-*.ucode
 
 %files -n iwl3160-firmware


@@ -741,6 +740,11 @@ rm -rf $RPM_BUILD_ROOT
 /lib/firmware/mwl8k
 /lib/firmware/mwlwifi
 
 /lib/firmware/mwl8k
 /lib/firmware/mwlwifi
 

+%files -n microcode-data-amd
+%defattr(644,root,root,755)
+%doc WHENCE LICENSE.amd-ucode amd-ucode/README
+/lib/firmware/amd-ucode
+

 %files -n netronome-firmware
 %defattr(644,root,root,755)
 %doc WHENCE
 %files -n netronome-firmware
 %defattr(644,root,root,755)
 %doc WHENCE