From a0a4e9a7fb3e84bc678e16ab3d4f8f5b430f79ae Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Mon, 1 Apr 2024 13:18:40 +0200 Subject: [PATCH 1/9] - release 2 --- linux-firmware.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux-firmware.spec b/linux-firmware.spec index 4eab45f..05db011 100644 --- a/linux-firmware.spec +++ b/linux-firmware.spec @@ -1,4 +1,4 @@ -%define rel 1 +%define rel 2 %define ver 20240312 Summary: Firmware files used by the Linux kernel Summary(pl.UTF-8): Pliki firmware'u używane przez jądro Linuksa -- 2.44.0 From 0347512f59c896530e44abfb5b77b9b676db6a5f Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Wed, 24 Apr 2024 00:32:07 +0200 Subject: [PATCH 2/9] - updated to 20240410 --- linux-firmware.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/linux-firmware.spec b/linux-firmware.spec index 05db011..6e5752b 100644 --- a/linux-firmware.spec +++ b/linux-firmware.spec @@ -1,5 +1,5 @@ -%define rel 2 -%define ver 20240312 +%define rel 1 +%define ver 20240410 Summary: Firmware files used by the Linux kernel Summary(pl.UTF-8): Pliki firmware'u używane przez jądro Linuksa Name: linux-firmware @@ -11,7 +11,7 @@ Group: Base/Kernel #Source0: https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/%{name}-%{version}.tar.gz # upstream tarball Source0: https://www.kernel.org/pub/linux/kernel/firmware/%{name}-%{version}.tar.xz -# Source0-md5: 3bacd4470fb0b49c7761d554159c9de0 +# Source0-md5: 6bed71700265b8508ef77fe697223120 URL: https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/ BuildRequires: tar >= 1:1.22 BuildRequires: xz -- 2.44.0 From b69c353c88350e8655e2dac5cc8dba6ad6411da9 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Sun, 5 May 2024 21:18:52 +0200 Subject: [PATCH 3/9] - use ./copy-firmware.sh, more subpackages, moved some files to proper subpackages --- linux-firmware.spec | 156 +++++++++++++++++++++++++++++++++----------- 1 file changed, 119 insertions(+), 37 deletions(-) diff --git a/linux-firmware.spec b/linux-firmware.spec index 6e5752b..a82889b 100644 --- a/linux-firmware.spec +++ b/linux-firmware.spec @@ -1,10 +1,10 @@ -%define rel 1 +%define rel 2 %define ver 20240410 Summary: Firmware files used by the Linux kernel Summary(pl.UTF-8): Pliki firmware'u używane przez jądro Linuksa Name: linux-firmware Version: %{ver} -Release: %{rel} +Release: %{rel}%{?tld} License: GPL+ and GPL v2+ and MIT and Redistributable, no modification permitted Group: Base/Kernel # in case git snapshot is needed @@ -13,10 +13,11 @@ Group: Base/Kernel Source0: https://www.kernel.org/pub/linux/kernel/firmware/%{name}-%{version}.tar.xz # Source0-md5: 6bed71700265b8508ef77fe697223120 URL: https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/ +BuildRequires: rdfind BuildRequires: tar >= 1:1.22 BuildRequires: xz -Requires: microcode-data-amd -Requires: microcode-data-intel +Suggests: microcode-data-amd +Suggests: microcode-data-intel BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -113,6 +114,14 @@ Group: Base/Kernel %description -n intel-sound-firmware Firmware for Intel sound cards +%package -n intel-vsc-firmware +Summary: Firmware for Intel Visual Sensing Controller (IVSC) +License: Redistributable, no modification permitted +Group: Base/Kernel + +%description -n intel-vsc-firmware +Firmware for Intel Visual Sensing Controller (IVSC) + %package -n iwl100-firmware Summary: Firmware for Intel(R) Wireless WiFi Link 100 Series Adapters License: Redistributable, no modification permitted @@ -380,6 +389,14 @@ Group: Base/Kernel %description -n netronome-firmware Firmware for Netronome Smart NICs +%package -n nxp +Summary: Firmware for NXP devices +License: Redistributable, no modification permitted +Group: Base/Kernel + +%description -n nxp +Firmware for NXP devices + %package -n nvidia-gpu-firmware Summary: Firmware for NVIDIA graphics chips License: Redistributable, no modification permitted @@ -405,33 +422,40 @@ Group: Base/Kernel This package contains the binary firmware for QLogic Infiniband, SCSI, Fibre Channel/FCoE adapters and Converged Network Adapters -%package -n ti-connectivity-firmware -Summary: Firmware for Texas Instruments wireless network chips +%package -n realtek-firmware +Summary: Firmware for Realtek WiFi/Bluetooth adapters License: Redistributable, no modification permitted Group: Base/Kernel -%description -n ti-connectivity-firmware -Firmware for Texas Instruments wireless network chips +%description -n realtek-firmware +Firmware for Realtek WiFi/Bluetooth adapters + +%package -n ti-firmware +Summary: Firmware for Texas Instruments devices +License: Redistributable, no modification permitted +Group: Base/Kernel + +%description -n ti-firmware +Firmware for Texas Instruments devices %define no_install_post_strip 1 %prep -%setup -qc -%{__mv} linux-firmware-*/* . -%{__rm} -r linux-firmware-* +%setup -q +#%{__mv} linux-firmware-*/* . +#%{__rm} -r linux-firmware-* # Remove source files we don't need to install %{__rm} */*.asm dsp56k/{Makefile,concat-bootstrap.pl} isci/{Makefile,README,*.[ch]} -%{__rm} -r carl9170fw usbdux contrib -%{__rm} Makefile configure build_packages.py copy-firmware.sh Dockerfile +%{__rm} -r carl9170fw usbdux +%{__rm} Makefile configure + +%{__mv} rtw88/README README.rtw88 %install 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.md,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 + +./copy-firmware.sh $RPM_BUILD_ROOT/lib/firmware %clean rm -rf $RPM_BUILD_ROOT @@ -467,7 +491,6 @@ rm -rf $RPM_BUILD_ROOT /lib/firmware/ctspeq.bin /lib/firmware/cypress /lib/firmware/dabusb -/lib/firmware/dpaa2 /lib/firmware/dsp56k /lib/firmware/dvb-fe-xc4000-*.fw /lib/firmware/dvb-fe-xc5000c-*.fw @@ -489,14 +512,10 @@ rm -rf $RPM_BUILD_ROOT /lib/firmware/hfi1_fabric.fw /lib/firmware/hfi1_pcie.fw /lib/firmware/hfi1_sbus.fw -/lib/firmware/htc_7010.fw -/lib/firmware/htc_9271.fw /lib/firmware/imx /lib/firmware/inside-secure %dir /lib/firmware/intel /lib/firmware/intel/ice -/lib/firmware/intel/ipu -/lib/firmware/intel/vsc /lib/firmware/isci /lib/firmware/isdbt_*.inp /lib/firmware/ixp4xx @@ -514,7 +533,6 @@ rm -rf $RPM_BUILD_ROOT /lib/firmware/mts_*.fw /lib/firmware/myri10ge_*.dat /lib/firmware/myricom -/lib/firmware/nxp /lib/firmware/ositech /lib/firmware/phanfw.bin /lib/firmware/powervr @@ -526,7 +544,7 @@ rm -rf $RPM_BUILD_ROOT /lib/firmware/qat_c3xxx_mmp.bin /lib/firmware/qat_c62x.bin /lib/firmware/qat_c62x_mmp.bin -/lib/firmware/qca +/lib/firmware/qat_mmp.bin /lib/firmware/r8a779x_usb3_v1.dlmem /lib/firmware/r8a779x_usb3_v2.dlmem /lib/firmware/r8a779x_usb3_v3.dlmem @@ -540,14 +558,13 @@ rm -rf $RPM_BUILD_ROOT /lib/firmware/rt2661.bin /lib/firmware/rt2860.bin /lib/firmware/rt2870.bin +/lib/firmware/rt3070.bin /lib/firmware/rt3071.bin +/lib/firmware/rt3090.bin /lib/firmware/rt3290.bin /lib/firmware/rt73.bin -/lib/firmware/rtl_bt -/lib/firmware/rtl_nic -/lib/firmware/rtlwifi -/lib/firmware/rtw88 -/lib/firmware/rtw89 +/lib/firmware/s2250.fw +/lib/firmware/s2250_loader.fw /lib/firmware/s5p-mfc.fw /lib/firmware/s5p-mfc-v6.fw /lib/firmware/s5p-mfc-v6-v2.fw @@ -567,11 +584,7 @@ rm -rf $RPM_BUILD_ROOT /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/tsse_firmware.bin /lib/firmware/ttusb-budget @@ -583,8 +596,6 @@ rm -rf $RPM_BUILD_ROOT /lib/firmware/vxge /lib/firmware/wfx /lib/firmware/whiteheat*.fw -/lib/firmware/wil6210.brd -/lib/firmware/wil6210.fw /lib/firmware/wsm_22.bin /lib/firmware/xe /lib/firmware/yam @@ -615,6 +626,11 @@ rm -rf $RPM_BUILD_ROOT /lib/firmware/ath3k-1.fw /lib/firmware/ath6k /lib/firmware/ath9k_htc +/lib/firmware/htc_7010.fw +/lib/firmware/htc_9271.fw +/lib/firmware/qca +/lib/firmware/wil6210.brd +/lib/firmware/wil6210.fw %files -n bnx2-firmware %defattr(644,root,root,755) @@ -662,6 +678,16 @@ rm -rf $RPM_BUILD_ROOT /lib/firmware/intel/catpt /lib/firmware/intel/dsp_fw_* /lib/firmware/intel/fw_sst_* +/lib/firmware/intel/IntcSST2.bin + +%files -n intel-vsc-firmware +%defattr(644,root,root,755) +%doc WHENCE LICENSE.ivsc +%dir /lib/firmware/intel +/lib/firmware/intel/ipu +/lib/firmware/intel/vsc +/lib/firmware/intel/ipu3-fw.bin +/lib/firmware/intel/irci_irci_ecr-master_20161208_0213_20170112_1500.bin %files -n iwl100-firmware %defattr(644,root,root,755) @@ -794,6 +820,12 @@ rm -rf $RPM_BUILD_ROOT %defattr(644,root,root,755) %doc WHENCE LICENCE.ralink_a_mediatek_company_firmware LICENCE.mediatek /lib/firmware/mediatek +/lib/firmware/mt7601u.bin +/lib/firmware/mt7650.bin +/lib/firmware/mt7662.bin +/lib/firmware/mt7662_rom_patch.bin +/lib/firmware/vpu_d.bin +/lib/firmware/vpu_p.bin %files -n mellanox-firmware %defattr(644,root,root,755) @@ -809,6 +841,11 @@ rm -rf $RPM_BUILD_ROOT %defattr(644,root,root,755) %doc WHENCE /lib/firmware/netronome +%files -n nxp +%defattr(644,root,root,755) +%doc WHENCE LICENSE.nxp_mc_firmware +/lib/firmware/dpaa2 +/lib/firmware/nxp %files -n nvidia-gpu-firmware %defattr(644,root,root,755) @@ -818,6 +855,8 @@ rm -rf $RPM_BUILD_ROOT %files -n qualcomm-firmware %defattr(644,root,root,755) %doc WHENCE LICENSE.qcom +/lib/firmware/a300_pfp.fw +/lib/firmware/a300_pm4.fw /lib/firmware/qcom %files -n qlogic-firmware @@ -835,7 +874,50 @@ rm -rf $RPM_BUILD_ROOT /lib/firmware/ql2400_fw.bin /lib/firmware/ql2500_fw.bin -%files -n ti-connectivity-firmware +%files -n realtek-firmware +%defattr(644,root,root,755) +%doc WHENCE +/lib/firmware/rtl_bt +/lib/firmware/rtl_nic +/lib/firmware/rtlwifi +/lib/firmware/rtw88 +/lib/firmware/rtw89 + +%files -n ti-firmware %defattr(644,root,root,755) %doc WHENCE +/lib/firmware/ti +/lib/firmware/ti_3410.fw +/lib/firmware/ti_5052.fw /lib/firmware/ti-connectivity +/lib/firmware/ti-keystone +/lib/firmware/INT8866RCA2.bin +/lib/firmware/TAS2XXX3870.bin +/lib/firmware/TAS2XXX387D.bin +/lib/firmware/TAS2XXX387E.bin +/lib/firmware/TAS2XXX387F.bin +/lib/firmware/TAS2XXX3880.bin +/lib/firmware/TAS2XXX3881.bin +/lib/firmware/TAS2XXX3882.bin +/lib/firmware/TAS2XXX3884.bin +/lib/firmware/TAS2XXX3886.bin +/lib/firmware/TAS2XXX38A5.bin +/lib/firmware/TAS2XXX38A7.bin +/lib/firmware/TAS2XXX38A8.bin +/lib/firmware/TAS2XXX38B8.bin +/lib/firmware/TAS2XXX38B9.bin +/lib/firmware/TAS2XXX38BA.bin +/lib/firmware/TAS2XXX38BB.bin +/lib/firmware/TAS2XXX38BE.bin +/lib/firmware/TAS2XXX38BF.bin +/lib/firmware/TAS2XXX38C3.bin +/lib/firmware/TAS2XXX38CB.bin +/lib/firmware/TAS2XXX38CD.bin +/lib/firmware/TAS2XXX38D3.bin +/lib/firmware/TAS2XXX38D4.bin +/lib/firmware/TAS2XXX38D5.bin +/lib/firmware/TAS2XXX38D6.bin +/lib/firmware/TAS2XXX38DF.bin +/lib/firmware/TAS2XXX38E0.bin +/lib/firmware/TIAS2781RCA2.bin +/lib/firmware/TIAS2781RCA4.bin -- 2.44.0 From d36c817e542a07dbe6b4a5a1e49e86d3228cec11 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Sun, 5 May 2024 21:32:17 +0200 Subject: [PATCH 4/9] - more subpackages and fixes --- linux-firmware.spec | 60 ++++++++++++++++++++++++++++----------------- 1 file changed, 37 insertions(+), 23 deletions(-) diff --git a/linux-firmware.spec b/linux-firmware.spec index a82889b..f6ffe55 100644 --- a/linux-firmware.spec +++ b/linux-firmware.spec @@ -33,6 +33,14 @@ operate. Ten pakiet zawiera pliki firmware'u wymagane do działania niektórych urządzeń. +%package -n alsa-firmware +Summary: Firmware for Advanced Linux Sound Architecture +License: Redistributable, no modification permitted +Group: Base/Kernel + +%description -n alsa-firmware +Firmware for Advanced Linux Sound Architecture + %package -n amd-gpu-firmware Summary: Firmware for AMD/ATI graphics chips License: Redistributable, no modification permitted @@ -438,6 +446,14 @@ Group: Base/Kernel %description -n ti-firmware Firmware for Texas Instruments devices +%package -n ueagle-atm-firmware +Summary: Firmware for USB ADSL Modems based on Eagle chipsets +License: Redistributable, no modification permitted +Group: Base/Kernel + +%description -n ueagle-atm-firmware +Firmware for USB ADSL Modems based on Eagle chipsets + %define no_install_post_strip 1 %prep @@ -481,15 +497,10 @@ rm -rf $RPM_BUILD_ROOT /lib/firmware/av7110 /lib/firmware/carl9170-1.fw /lib/firmware/cadence -/lib/firmware/cirrus /lib/firmware/cis /lib/firmware/cmmb_*_12mhz.inp /lib/firmware/cnm /lib/firmware/cpia2 -/lib/firmware/cs42l43.bin -/lib/firmware/ctefx.bin -/lib/firmware/ctspeq.bin -/lib/firmware/cypress /lib/firmware/dabusb /lib/firmware/dsp56k /lib/firmware/dvb-fe-xc4000-*.fw @@ -505,7 +516,6 @@ rm -rf $RPM_BUILD_ROOT /lib/firmware/emi26 /lib/firmware/emi62 /lib/firmware/ene-ub6250 -/lib/firmware/ess /lib/firmware/f2255usb.bin /lib/firmware/go7007 /lib/firmware/hfi1_dc8051.fw @@ -522,8 +532,6 @@ rm -rf $RPM_BUILD_ROOT /lib/firmware/kaweth /lib/firmware/keyspan /lib/firmware/keyspan_pda -%dir /lib/firmware/korg -/lib/firmware/korg/k1212.dsp /lib/firmware/lgs8g75.fw /lib/firmware/lt9611uxc_fw.bin /lib/firmware/matrox @@ -571,12 +579,6 @@ rm -rf $RPM_BUILD_ROOT /lib/firmware/s5p-mfc-v7.fw /lib/firmware/s5p-mfc-v8.fw /lib/firmware/s5p-mfc-v12.fw -%dir /lib/firmware/sb16 -/lib/firmware/sb16/alaw_main.csp -/lib/firmware/sb16/ima_adpcm_capture.csp -/lib/firmware/sb16/ima_adpcm_init.csp -/lib/firmware/sb16/ima_adpcm_playback.csp -/lib/firmware/sb16/mulaw_main.csp /lib/firmware/sdd_sagrad_*.bin /lib/firmware/slicoss /lib/firmware/sms1xxx-*.fw @@ -588,7 +590,6 @@ rm -rf $RPM_BUILD_ROOT /lib/firmware/tlg2300_firmware.bin /lib/firmware/tsse_firmware.bin /lib/firmware/ttusb-budget -/lib/firmware/ueagle-atm /lib/firmware/usbdux*_firmware.bin /lib/firmware/v4l-cx*.fw /lib/firmware/vicam @@ -599,11 +600,18 @@ rm -rf $RPM_BUILD_ROOT /lib/firmware/wsm_22.bin /lib/firmware/xe /lib/firmware/yam -%dir /lib/firmware/yamaha -/lib/firmware/yamaha/ds1_ctrl.fw -/lib/firmware/yamaha/ds1_dsp.fw -/lib/firmware/yamaha/ds1e_ctrl.fw -/lib/firmware/yamaha/yss225_registers.bin + +%files -n alsa-firmware +%defattr(644,root,root,755) +%doc WHENCE +/lib/firmware/cirrus +/lib/firmware/cs42l43.bin +/lib/firmware/ctefx.bin +/lib/firmware/ctspeq.bin +/lib/firmware/ess +/lib/firmware/korg +/lib/firmware/sb16 +/lib/firmware/yamaha %files -n amd-gpu-firmware %defattr(644,root,root,755) @@ -644,8 +652,9 @@ rm -rf $RPM_BUILD_ROOT %files -n brcm-firmware %defattr(644,root,root,755) -%doc WHENCE LICENCE.broadcom_bcm43xx +%doc WHENCE LICENCE.broadcom_bcm43xx LICENCE.cypress /lib/firmware/brcm +/lib/firmware/cypress %files -n cavium-firmware %defattr(644,root,root,755) @@ -876,7 +885,7 @@ rm -rf $RPM_BUILD_ROOT %files -n realtek-firmware %defattr(644,root,root,755) -%doc WHENCE +%doc WHENCE LICENCE.rtlwifi_firmware.txt /lib/firmware/rtl_bt /lib/firmware/rtl_nic /lib/firmware/rtlwifi @@ -885,7 +894,7 @@ rm -rf $RPM_BUILD_ROOT %files -n ti-firmware %defattr(644,root,root,755) -%doc WHENCE +%doc WHENCE LICENCE.ti-connectivity LICENCE.ti-keystone LICENCE.ti-tspa LICENCE.wl1251 /lib/firmware/ti /lib/firmware/ti_3410.fw /lib/firmware/ti_5052.fw @@ -921,3 +930,8 @@ rm -rf $RPM_BUILD_ROOT /lib/firmware/TAS2XXX38E0.bin /lib/firmware/TIAS2781RCA2.bin /lib/firmware/TIAS2781RCA4.bin + +%files -n ueagle-atm-firmware +%defattr(644,root,root,755) +%doc WHENCE LICENCE.ueagle-atm4-firmware +/lib/firmware/ueagle-atm -- 2.44.0 From 58db973114f38628519c3711dd8ee1ccc9c91d62 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Sun, 5 May 2024 22:11:46 +0200 Subject: [PATCH 5/9] - more subpackages and fixes --- linux-firmware.spec | 131 ++++++++++++++++++++++++++------------------ 1 file changed, 78 insertions(+), 53 deletions(-) diff --git a/linux-firmware.spec b/linux-firmware.spec index f6ffe55..6567a45 100644 --- a/linux-firmware.spec +++ b/linux-firmware.spec @@ -33,6 +33,14 @@ operate. Ten pakiet zawiera pliki firmware'u wymagane do działania niektórych urządzeń. +%package -n alacritech-firmware +Summary: Firmware for Alacritech IS-NIC products +License: Redistributable, no modification permitted +Group: Base/Kernel + +%description -n alacritech-firmware +Firmware for Alacritech IS-NIC products + %package -n alsa-firmware Summary: Firmware for Advanced Linux Sound Architecture License: Redistributable, no modification permitted @@ -58,6 +66,14 @@ Group: Base/Kernel %description -n atheros-firmware Firmware for Atheros wireless and Bluetooth cards +%package -n av-firmware +Summary: Firmware for various audio/video devices +License: Redistributable, no modification permitted +Group: Base/Kernel + +%description -n av-firmware +Firmware for various audio/video devices + %package -n bnx2-firmware Summary: Firmware for Broadcom NetXtremeII License: Redistributable, no modification permitted @@ -458,14 +474,13 @@ Firmware for USB ADSL Modems based on Eagle chipsets %prep %setup -q -#%{__mv} linux-firmware-*/* . -#%{__rm} -r linux-firmware-* # Remove source files we don't need to install %{__rm} */*.asm dsp56k/{Makefile,concat-bootstrap.pl} isci/{Makefile,README,*.[ch]} %{__rm} -r carl9170fw usbdux %{__rm} Makefile configure +%{__mv} amd-ucode/README README.amd-ucode %{__mv} rtw88/README README.rtw88 %install @@ -483,41 +498,20 @@ rm -rf $RPM_BUILD_ROOT /lib/firmware/acenic /lib/firmware/adaptec /lib/firmware/advansys -/lib/firmware/airoha /lib/firmware/agere_*_fw.bin +/lib/firmware/airoha /lib/firmware/amd /lib/firmware/amdtee /lib/firmware/amlogic -/lib/firmware/amphion /lib/firmware/arm -/lib/firmware/as102_data1_st.hex -/lib/firmware/as102_data2_st.hex /lib/firmware/atmel /lib/firmware/atusb -/lib/firmware/av7110 /lib/firmware/carl9170-1.fw /lib/firmware/cadence /lib/firmware/cis -/lib/firmware/cmmb_*_12mhz.inp -/lib/firmware/cnm -/lib/firmware/cpia2 -/lib/firmware/dabusb -/lib/firmware/dsp56k -/lib/firmware/dvb-fe-xc4000-*.fw -/lib/firmware/dvb-fe-xc5000c-*.fw -/lib/firmware/dvb-fe-xc5000-*.fw -/lib/firmware/dvb_nova_12mhz*.inp -/lib/firmware/dvb-usb-dib0700-*.fw -/lib/firmware/dvb-usb-it9135-01.fw -/lib/firmware/dvb-usb-it9135-02.fw -/lib/firmware/dvb-usb-terratec-h5-drxk.fw /lib/firmware/e100 /lib/firmware/edgeport -/lib/firmware/emi26 -/lib/firmware/emi62 /lib/firmware/ene-ub6250 -/lib/firmware/f2255usb.bin -/lib/firmware/go7007 /lib/firmware/hfi1_dc8051.fw /lib/firmware/hfi1_fabric.fw /lib/firmware/hfi1_pcie.fw @@ -527,15 +521,12 @@ rm -rf $RPM_BUILD_ROOT %dir /lib/firmware/intel /lib/firmware/intel/ice /lib/firmware/isci -/lib/firmware/isdbt_*.inp /lib/firmware/ixp4xx /lib/firmware/kaweth /lib/firmware/keyspan /lib/firmware/keyspan_pda -/lib/firmware/lgs8g75.fw /lib/firmware/lt9611uxc_fw.bin /lib/firmware/matrox -/lib/firmware/meson /lib/firmware/microchip /lib/firmware/moxa /lib/firmware/mts_*.fw @@ -571,39 +562,31 @@ rm -rf $RPM_BUILD_ROOT /lib/firmware/rt3090.bin /lib/firmware/rt3290.bin /lib/firmware/rt73.bin -/lib/firmware/s2250.fw -/lib/firmware/s2250_loader.fw -/lib/firmware/s5p-mfc.fw -/lib/firmware/s5p-mfc-v6.fw -/lib/firmware/s5p-mfc-v6-v2.fw -/lib/firmware/s5p-mfc-v7.fw -/lib/firmware/s5p-mfc-v8.fw -/lib/firmware/s5p-mfc-v12.fw /lib/firmware/sdd_sagrad_*.bin -/lib/firmware/slicoss -/lib/firmware/sms1xxx-*.fw /lib/firmware/sun -/lib/firmware/sxg -/lib/firmware/tdmb_nova_12mhz.inp /lib/firmware/tehuti /lib/firmware/tigon /lib/firmware/tlg2300_firmware.bin /lib/firmware/tsse_firmware.bin /lib/firmware/ttusb-budget /lib/firmware/usbdux*_firmware.bin -/lib/firmware/v4l-cx*.fw /lib/firmware/vicam /lib/firmware/vntwusb.fw /lib/firmware/vxge /lib/firmware/wfx /lib/firmware/whiteheat*.fw /lib/firmware/wsm_22.bin -/lib/firmware/xe /lib/firmware/yam -%files -n alsa-firmware +%files -n alacritech-firmware %defattr(644,root,root,755) %doc WHENCE +/lib/firmware/slicoss +/lib/firmware/sxg + +%files -n alsa-firmware +%defattr(644,root,root,755) +%doc WHENCE LICENCE.ca0132 LICENSE.cirrus /lib/firmware/cirrus /lib/firmware/cs42l43.bin /lib/firmware/ctefx.bin @@ -622,7 +605,7 @@ rm -rf $RPM_BUILD_ROOT %files -n atheros-firmware %defattr(644,root,root,755) -%doc WHENCE LICENCE.atheros_firmware LICENSE.QualcommAtheros_ar3k LICENSE.QualcommAtheros_ath10k LICENCE.open-ath9k-htc-firmware +%doc WHENCE LICENCE.atheros_firmware LICENCE.open-ath9k-htc-firmware LICENSE.qcom LICENSE.QualcommAtheros_ar3k LICENSE.QualcommAtheros_ath10k /lib/firmware/ar3k /lib/firmware/ar5523.bin /lib/firmware/ar7010*.fw @@ -640,6 +623,46 @@ rm -rf $RPM_BUILD_ROOT /lib/firmware/wil6210.brd /lib/firmware/wil6210.fw +%files -n av-firmware +%defattr(644,root,root,755) +%doc WHENCE LICENCE.Abilis LICENSE.amlogic_vdec LICENSE.amphion_vpu LICENCE.cnm LICENSE.dib0700 LICENCE.go7007 LICENCE.siano LICENCE.xc4000 +/lib/firmware/amphion +/lib/firmware/as102_data1_st.hex +/lib/firmware/as102_data2_st.hex +/lib/firmware/av7110 +/lib/firmware/cmmb_*_12mhz.inp +/lib/firmware/cnm +/lib/firmware/cpia2 +/lib/firmware/dabusb +/lib/firmware/dsp56k +/lib/firmware/dvb-fe-xc4000-*.fw +/lib/firmware/dvb-fe-xc5000c-*.fw +/lib/firmware/dvb-fe-xc5000-*.fw +/lib/firmware/dvb_nova_12mhz*.inp +/lib/firmware/dvb-usb-dib0700-*.fw +/lib/firmware/dvb-usb-it9135-01.fw +/lib/firmware/dvb-usb-it9135-02.fw +/lib/firmware/dvb-usb-terratec-h5-drxk.fw +/lib/firmware/emi26 +/lib/firmware/emi62 +/lib/firmware/f2255usb.bin +/lib/firmware/go7007 +/lib/firmware/isdbt_*.inp +/lib/firmware/lgs8g75.fw +/lib/firmware/meson +/lib/firmware/s5p-mfc.fw +/lib/firmware/s5p-mfc-v6.fw +/lib/firmware/s5p-mfc-v6-v2.fw +/lib/firmware/s5p-mfc-v7.fw +/lib/firmware/s5p-mfc-v8.fw +/lib/firmware/s5p-mfc-v12.fw +/lib/firmware/sms1xxx-*.fw +/lib/firmware/s2250.fw +/lib/firmware/s2250_loader.fw +/lib/firmware/tdmb_nova_12mhz.inp +/lib/firmware/v4l-cx*.fw + + %files -n bnx2-firmware %defattr(644,root,root,755) %doc WHENCE @@ -658,7 +681,7 @@ rm -rf $RPM_BUILD_ROOT %files -n cavium-firmware %defattr(644,root,root,755) -%doc WHENCE LICENCE.cavium +%doc WHENCE LICENCE.cavium LICENCE.cavium_liquidio /lib/firmware/cavium /lib/firmware/liquidio @@ -676,12 +699,13 @@ rm -rf $RPM_BUILD_ROOT %files -n intel-gpu-firmware %defattr(644,root,root,755) -%doc WHENCE LICENSE.i915 +%doc WHENCE LICENSE.i915 LICENSE.xe /lib/firmware/i915 +/lib/firmware/xe %files -n intel-sound-firmware %defattr(644,root,root,755) -%doc WHENCE LICENCE.adsp_sst LICENCE.fw_sst_0f28 +%doc WHENCE LICENCE.adsp_sst LICENCE.IntcSST2 LICENCE.fw_sst_0f28 %dir /lib/firmware/intel /lib/firmware/intel/avs /lib/firmware/intel/catpt @@ -691,7 +715,7 @@ rm -rf $RPM_BUILD_ROOT %files -n intel-vsc-firmware %defattr(644,root,root,755) -%doc WHENCE LICENSE.ivsc +%doc WHENCE LICENSE.ipu3_firmware LICENSE.ivsc %dir /lib/firmware/intel /lib/firmware/intel/ipu /lib/firmware/intel/vsc @@ -818,7 +842,7 @@ rm -rf $RPM_BUILD_ROOT %files -n marvell-firmware %defattr(644,root,root,755) -%doc WHENCE LICENCE.Marvell LICENCE.OLPC +%doc WHENCE LICENCE.Marvell LICENCE.NXP LICENCE.OLPC /lib/firmware/lbtf_usb.bin /lib/firmware/libertas /lib/firmware/mrvl @@ -827,7 +851,7 @@ rm -rf $RPM_BUILD_ROOT %files -n mediatek-firmware %defattr(644,root,root,755) -%doc WHENCE LICENCE.ralink_a_mediatek_company_firmware LICENCE.mediatek +%doc WHENCE LICENCE.mediatek LICENCE.ralink_a_mediatek_company_firmware LICENCE.ralink-firmware.txt /lib/firmware/mediatek /lib/firmware/mt7601u.bin /lib/firmware/mt7650.bin @@ -843,16 +867,17 @@ rm -rf $RPM_BUILD_ROOT %files -n microcode-data-amd %defattr(644,root,root,755) -%doc WHENCE LICENSE.amd-ucode amd-ucode/README +%doc WHENCE LICENSE.amd-ucode README.amd-ucode /lib/firmware/amd-ucode %files -n netronome-firmware %defattr(644,root,root,755) -%doc WHENCE +%doc WHENCE LICENCE.Netronome /lib/firmware/netronome + %files -n nxp %defattr(644,root,root,755) -%doc WHENCE LICENSE.nxp_mc_firmware +%doc WHENCE LICENSE.nxp LICENSE.nxp_mc_firmware /lib/firmware/dpaa2 /lib/firmware/nxp @@ -885,7 +910,7 @@ rm -rf $RPM_BUILD_ROOT %files -n realtek-firmware %defattr(644,root,root,755) -%doc WHENCE LICENCE.rtlwifi_firmware.txt +%doc WHENCE LICENCE.rtlwifi_firmware.txt README.rtw88 /lib/firmware/rtl_bt /lib/firmware/rtl_nic /lib/firmware/rtlwifi -- 2.44.0 From 4ad4df3574ab93a6cb6a0a4423ff0aa762d4dc3f Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Sun, 5 May 2024 22:41:29 +0200 Subject: [PATCH 6/9] - ethernet and wireless moved out from main package to subpackages --- linux-firmware.spec | 123 +++++++++++++++++++++++++++----------------- 1 file changed, 75 insertions(+), 48 deletions(-) diff --git a/linux-firmware.spec b/linux-firmware.spec index 6567a45..84fdd01 100644 --- a/linux-firmware.spec +++ b/linux-firmware.spec @@ -59,12 +59,12 @@ Provides: radeon-ucode Firmware for AMD/ATI graphics chips %package -n atheros-firmware -Summary: Firmware for Atheros wireless and Bluetooth cards +Summary: Firmware for Atheros wireless and Bluetooth adapters License: Redistributable, no modification permitted Group: Base/Kernel %description -n atheros-firmware -Firmware for Atheros wireless and Bluetooth cards +Firmware for Atheros wireless and Bluetooth adapteres %package -n av-firmware Summary: Firmware for various audio/video devices @@ -91,12 +91,12 @@ Group: Base/Kernel Firmware for Broadcom NetXtreme II 10Gb %package -n brcm-firmware -Summary: Firmware for Broadcom 802.11 wireless cards +Summary: Firmware for Broadcom 802.11 wireless adapters License: Redistributable, no modification permitted Group: Base/Kernel %description -n brcm-firmware -Firmware for Broadcom 802.11 wireless cards +Firmware for Broadcom 802.11 wireless adapters %package -n cavium-firmware Summary: Firmware for Cavium crypto and Ethernet adapters @@ -114,6 +114,14 @@ Group: Base/Kernel %description -n chelsio-firmware Firmware for Chelsio T3/T4/T5/T6 +%package -n ethernet-firmware +Summary: Firmware for various ethernet adapters +License: Redistributable, no modification permitted +Group: Base/Kernel + +%description -n ethernet-firmware +Firmware for various ethernet adapters + %package -n intel-bluetooth-firmware Summary: Firmware for Intel Bluetooth adapters License: Redistributable, no modification permitted @@ -131,12 +139,12 @@ Group: Base/Kernel Firmware for Intel i915 graphics chips %package -n intel-sound-firmware -Summary: Firmware for Intel sound cards +Summary: Firmware for Intel sound adapters License: Redistributable, no modification permitted Group: Base/Kernel %description -n intel-sound-firmware -Firmware for Intel sound cards +Firmware for Intel sound adapters %package -n intel-vsc-firmware Summary: Firmware for Intel Visual Sensing Controller (IVSC) @@ -374,20 +382,20 @@ conditions contained inside the provided LICENSE file. Please read it carefully. %package -n marvell-firmware -Summary: Firmware for Marvell wirelsess network cards +Summary: Firmware for Marvell wirelsess network adapters License: Redistributable, no modification permitted Group: Base/Kernel %description -n marvell-firmware -Firmware for Marvell wireless network cards +Firmware for Marvell wireless network adapters %package -n mediatek-firmware -Summary: Firmware for MediaTek devices +Summary: Firmware for MediaTek wireless and Bluetooth adapters License: Redistributable, no modification permitted Group: Base/Kernel %description -n mediatek-firmware -Firmware for MediaTek devices. +Firmware for MediaTek wireless and Bluetooth adapters %package -n mellanox-firmware Summary: Firmware for Mellanox Spectrum switches @@ -447,12 +455,12 @@ This package contains the binary firmware for QLogic Infiniband, SCSI, Fibre Channel/FCoE adapters and Converged Network Adapters %package -n realtek-firmware -Summary: Firmware for Realtek WiFi/Bluetooth adapters +Summary: Firmware for Realtek wireless and Bluetooth adapters License: Redistributable, no modification permitted Group: Base/Kernel %description -n realtek-firmware -Firmware for Realtek WiFi/Bluetooth adapters +Firmware for Realtek wireless and Bluetooth adapters %package -n ti-firmware Summary: Firmware for Texas Instruments devices @@ -470,6 +478,14 @@ Group: Base/Kernel %description -n ueagle-atm-firmware Firmware for USB ADSL Modems based on Eagle chipsets +%package -n wireless-firmware +Summary: Firmware for various wireless adapters +License: Redistributable, no modification permitted +Group: Base/Kernel + +%description -n wireless-firmware +Firmware for various wireless adapters + %define no_install_post_strip 1 %prep @@ -482,6 +498,7 @@ Firmware for USB ADSL Modems based on Eagle chipsets %{__mv} amd-ucode/README README.amd-ucode %{__mv} rtw88/README README.rtw88 +%{__mv} wfx/LICENCE.wf200 LICENCE.wf200 %install rm -rf $RPM_BUILD_ROOT @@ -494,22 +511,14 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) %doc WHENCE LICENCE.* LICENSE.* README.md -/lib/firmware/3com -/lib/firmware/acenic -/lib/firmware/adaptec /lib/firmware/advansys -/lib/firmware/agere_*_fw.bin -/lib/firmware/airoha /lib/firmware/amd /lib/firmware/amdtee /lib/firmware/amlogic /lib/firmware/arm -/lib/firmware/atmel -/lib/firmware/atusb /lib/firmware/carl9170-1.fw /lib/firmware/cadence /lib/firmware/cis -/lib/firmware/e100 /lib/firmware/edgeport /lib/firmware/ene-ub6250 /lib/firmware/hfi1_dc8051.fw @@ -518,22 +527,15 @@ rm -rf $RPM_BUILD_ROOT /lib/firmware/hfi1_sbus.fw /lib/firmware/imx /lib/firmware/inside-secure -%dir /lib/firmware/intel -/lib/firmware/intel/ice /lib/firmware/isci /lib/firmware/ixp4xx -/lib/firmware/kaweth /lib/firmware/keyspan /lib/firmware/keyspan_pda /lib/firmware/lt9611uxc_fw.bin /lib/firmware/matrox -/lib/firmware/microchip /lib/firmware/moxa /lib/firmware/mts_*.fw -/lib/firmware/myri10ge_*.dat -/lib/firmware/myricom /lib/firmware/ositech -/lib/firmware/phanfw.bin /lib/firmware/powervr /lib/firmware/qat_4xxx.bin /lib/firmware/qat_4xxx_mmp.bin @@ -550,32 +552,13 @@ rm -rf $RPM_BUILD_ROOT %dir /lib/firmware/rockchip /lib/firmware/rockchip/dptx.bin /lib/firmware/rp2.fw -/lib/firmware/rsi -/lib/firmware/rsi_91x.fw -/lib/firmware/rt2561.bin -/lib/firmware/rt2561s.bin -/lib/firmware/rt2661.bin -/lib/firmware/rt2860.bin -/lib/firmware/rt2870.bin -/lib/firmware/rt3070.bin -/lib/firmware/rt3071.bin -/lib/firmware/rt3090.bin -/lib/firmware/rt3290.bin -/lib/firmware/rt73.bin -/lib/firmware/sdd_sagrad_*.bin /lib/firmware/sun -/lib/firmware/tehuti -/lib/firmware/tigon /lib/firmware/tlg2300_firmware.bin /lib/firmware/tsse_firmware.bin /lib/firmware/ttusb-budget /lib/firmware/usbdux*_firmware.bin /lib/firmware/vicam -/lib/firmware/vntwusb.fw -/lib/firmware/vxge -/lib/firmware/wfx /lib/firmware/whiteheat*.fw -/lib/firmware/wsm_22.bin /lib/firmware/yam %files -n alacritech-firmware @@ -662,7 +645,6 @@ rm -rf $RPM_BUILD_ROOT /lib/firmware/tdmb_nova_12mhz.inp /lib/firmware/v4l-cx*.fw - %files -n bnx2-firmware %defattr(644,root,root,755) %doc WHENCE @@ -691,6 +673,28 @@ rm -rf $RPM_BUILD_ROOT /lib/firmware/cxgb3 /lib/firmware/cxgb4 +%files -n ethernet-firmware +%defattr(644,root,root,755) +%doc WHENCE LICENSE.airoha LICENCE.e100 LICENSE.ice LICENSE.ice_enhanced LICENCE.kaweth LICENCE.microchip LICENCE.myri10ge_firmware LICENCE.phanfw LICENCE.mediatek +/lib/firmware/3com +/lib/firmware/acenic +/lib/firmware/adaptec +/lib/firmware/airoha +/lib/firmware/e100 +%dir /lib/firmware/intel +/lib/firmware/intel/ice +/lib/firmware/kaweth +%dir /lib/firmware/mediatek +/lib/firmware/mediatek/mt7988 +/lib/firmware/microchip +/lib/firmware/myri10ge_*.dat +/lib/firmware/myricom +/lib/firmware/phanfw.bin +/lib/firmware/rtl_nic +/lib/firmware/tehuti +/lib/firmware/tigon +/lib/firmware/vxge + %files -n intel-bluetooth-firmware %defattr(644,root,root,755) %doc WHENCE LICENCE.ibt_firmware @@ -853,11 +857,22 @@ rm -rf $RPM_BUILD_ROOT %defattr(644,root,root,755) %doc WHENCE LICENCE.mediatek LICENCE.ralink_a_mediatek_company_firmware LICENCE.ralink-firmware.txt /lib/firmware/mediatek +%exclude /lib/firmware/mediatek/mt7988 /lib/firmware/mt7601u.bin /lib/firmware/mt7650.bin /lib/firmware/mt7662.bin /lib/firmware/mt7662_rom_patch.bin /lib/firmware/vpu_d.bin +/lib/firmware/rt2561.bin +/lib/firmware/rt2561s.bin +/lib/firmware/rt2661.bin +/lib/firmware/rt2860.bin +/lib/firmware/rt2870.bin +/lib/firmware/rt3070.bin +/lib/firmware/rt3071.bin +/lib/firmware/rt3090.bin +/lib/firmware/rt3290.bin +/lib/firmware/rt73.bin /lib/firmware/vpu_p.bin %files -n mellanox-firmware @@ -912,7 +927,6 @@ rm -rf $RPM_BUILD_ROOT %defattr(644,root,root,755) %doc WHENCE LICENCE.rtlwifi_firmware.txt README.rtw88 /lib/firmware/rtl_bt -/lib/firmware/rtl_nic /lib/firmware/rtlwifi /lib/firmware/rtw88 /lib/firmware/rtw89 @@ -960,3 +974,16 @@ rm -rf $RPM_BUILD_ROOT %defattr(644,root,root,755) %doc WHENCE LICENCE.ueagle-atm4-firmware /lib/firmware/ueagle-atm + +%files -n wireless-firmware +%defattr(644,root,root,755) +%doc WHENCE LICENCE.agere LICENSE.atmel LICENCE.via_vt6656 LICENCE.wf200 +/lib/firmware/agere_*_fw.bin +/lib/firmware/atmel +/lib/firmware/atusb +/lib/firmware/rsi +/lib/firmware/rsi_91x.fw +/lib/firmware/sdd_sagrad_*.bin +/lib/firmware/wfx +/lib/firmware/wsm_22.bin +/lib/firmware/vntwusb.fw -- 2.44.0 From d6a3da582862e7fd42896a2a1e255edef3d2958e Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Sun, 5 May 2024 22:45:51 +0200 Subject: [PATCH 7/9] - drop S: microcode-{amd,intel} --- linux-firmware.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/linux-firmware.spec b/linux-firmware.spec index 84fdd01..1aa4037 100644 --- a/linux-firmware.spec +++ b/linux-firmware.spec @@ -16,8 +16,6 @@ URL: https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/ BuildRequires: rdfind BuildRequires: tar >= 1:1.22 BuildRequires: xz -Suggests: microcode-data-amd -Suggests: microcode-data-intel BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -- 2.44.0 From dec2e47751cf94d3406bd94e1ab1e3ef47bfd59c Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Sun, 5 May 2024 22:52:33 +0200 Subject: [PATCH 8/9] - moved vicam to av subpackage --- linux-firmware.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux-firmware.spec b/linux-firmware.spec index 1aa4037..1a76b17 100644 --- a/linux-firmware.spec +++ b/linux-firmware.spec @@ -555,7 +555,6 @@ rm -rf $RPM_BUILD_ROOT /lib/firmware/tsse_firmware.bin /lib/firmware/ttusb-budget /lib/firmware/usbdux*_firmware.bin -/lib/firmware/vicam /lib/firmware/whiteheat*.fw /lib/firmware/yam @@ -642,6 +641,7 @@ rm -rf $RPM_BUILD_ROOT /lib/firmware/s2250_loader.fw /lib/firmware/tdmb_nova_12mhz.inp /lib/firmware/v4l-cx*.fw +/lib/firmware/vicam %files -n bnx2-firmware %defattr(644,root,root,755) -- 2.44.0 From d3f9d68e4166ba56e021729b9fc012f70f325ab3 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Sun, 5 May 2024 23:11:04 +0200 Subject: [PATCH 9/9] - moved bnx2 and bnx2x firmware to ethernet subpackage --- linux-firmware.spec | 28 ++-------------------------- 1 file changed, 2 insertions(+), 26 deletions(-) diff --git a/linux-firmware.spec b/linux-firmware.spec index 1a76b17..ccbe8ce 100644 --- a/linux-firmware.spec +++ b/linux-firmware.spec @@ -72,22 +72,6 @@ Group: Base/Kernel %description -n av-firmware Firmware for various audio/video devices -%package -n bnx2-firmware -Summary: Firmware for Broadcom NetXtremeII -License: Redistributable, no modification permitted -Group: Base/Kernel - -%description -n bnx2-firmware -Firmware for Broadcom NetXtremeII - -%package -n bnx2x-firmware -Summary: Firmware for Broadcom NetXtreme II 10Gb -License: Redistributable, no modification permitted -Group: Base/Kernel - -%description -n bnx2x-firmware -Firmware for Broadcom NetXtreme II 10Gb - %package -n brcm-firmware Summary: Firmware for Broadcom 802.11 wireless adapters License: Redistributable, no modification permitted @@ -643,16 +627,6 @@ rm -rf $RPM_BUILD_ROOT /lib/firmware/v4l-cx*.fw /lib/firmware/vicam -%files -n bnx2-firmware -%defattr(644,root,root,755) -%doc WHENCE -/lib/firmware/bnx2 - -%files -n bnx2x-firmware -%defattr(644,root,root,755) -%doc WHENCE -/lib/firmware/bnx2x - %files -n brcm-firmware %defattr(644,root,root,755) %doc WHENCE LICENCE.broadcom_bcm43xx LICENCE.cypress @@ -678,6 +652,8 @@ rm -rf $RPM_BUILD_ROOT /lib/firmware/acenic /lib/firmware/adaptec /lib/firmware/airoha +/lib/firmware/bnx2 +/lib/firmware/bnx2x /lib/firmware/e100 %dir /lib/firmware/intel /lib/firmware/intel/ice -- 2.44.0