[packages/linux-firmware] up to 20241017

Wed Oct 23 17:38:03 CEST 2024

commit 99ce4b44d250570686cc15a6eec396cb3fd0e3c9
Author: Jan Palus <atler at pld-linux.org>
Date:   Wed Oct 23 17:05:05 2024 +0200

    up to 20241017
    
    - patch to disable check_whence.py invocation which is valid only within
      git repository
    - since we remove some of the firmware files add patch with check for
      their existence before attempting installation

 check-files.patch          | 18 ++++++++++++++++++
 disable-check-whence.patch | 13 +++++++++++++
 linux-firmware.spec        | 21 ++++++++++++++++++---
 3 files changed, 49 insertions(+), 3 deletions(-)
---

diff --git a/linux-firmware.spec b/linux-firmware.spec
index 76b40fd..cafe501 100644
--- a/linux-firmware.spec
+++ b/linux-firmware.spec
@@ -5,7 +5,7 @@
 # - subpackages for various firmwares?
 # - (since 5.3) compress firmware: https://git.kernel.org/linus/82fd7a8142a10b8eb41313074b3859d82c0857dc
 %define		rel	1
-%define		ver	20240909
+%define		ver	20241017
 Summary:	Firmware files used by the Linux kernel
 Summary(pl.UTF-8):	Pliki firmware'u używane przez jądro Linuksa
 Name:		linux-firmware
@@ -18,7 +18,9 @@ Group:		Base/Kernel
 #Source0:	https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/%{name}-%{snap}.tar.gz
 # upstream tarball
 Source0:	https://www.kernel.org/pub/linux/kernel/firmware/%{name}-%{version}.tar.xz
-# Source0-md5:	0951f2fa4febc89e97312cee54419124
+# Source0-md5:	f01b3231d0d97d0e8d52047a8aa353c7
+Patch0:		disable-check-whence.patch
+Patch1:		check-files.patch
 URL:		https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/
 BuildRequires:	rdfind
 BuildRequires:	tar >= 1:1.22
@@ -618,6 +620,8 @@ punktów sieci OLPC.
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 # Remove firmware shipped in separate packages already
 # Perhaps these should be built as subpackages of linux-firmware?
@@ -649,7 +653,7 @@ punktów sieci OLPC.
 # 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
+%{__rm} Makefile
 
 %{__mv} rtw88/README README.rtw88
 
@@ -924,10 +928,13 @@ rm -rf $RPM_BUILD_ROOT
 %dir /lib/firmware/mediatek
 /lib/firmware/mediatek/BT_RAM_CODE_MT7922_1_1_hdr.bin
 /lib/firmware/mediatek/BT_RAM_CODE_MT7961_1_2_hdr.bin
+/lib/firmware/mediatek/BT_RAM_CODE_MT7961_1a_2_hdr.bin
 /lib/firmware/mediatek/WIFI_MT7922_patch_mcu_1_1_hdr.bin
 /lib/firmware/mediatek/WIFI_MT7961_patch_mcu_1_2_hdr.bin
+/lib/firmware/mediatek/WIFI_MT7961_patch_mcu_1a_2_hdr.bin
 /lib/firmware/mediatek/WIFI_RAM_CODE_MT7922_1.bin
 /lib/firmware/mediatek/WIFI_RAM_CODE_MT7961_1.bin
+/lib/firmware/mediatek/WIFI_RAM_CODE_MT7961_1a.bin
 /lib/firmware/mediatek/mt7601u.bin
 /lib/firmware/mediatek/mt7610e.bin
 /lib/firmware/mediatek/mt7610u.bin
@@ -976,6 +983,8 @@ rm -rf $RPM_BUILD_ROOT
 /lib/firmware/mediatek/mt7986_wm_mt7975.bin
 /lib/firmware/mediatek/mt7986_wo_*.bin
 /lib/firmware/mediatek/mt7988
+/lib/firmware/mediatek/mt7988_wo_0.bin
+/lib/firmware/mediatek/mt7988_wo_1.bin
 /lib/firmware/mediatek/mt7996
 /lib/firmware/mediatek/mt8173
 /lib/firmware/mediatek/mt8183
@@ -1060,6 +1069,10 @@ rm -rf $RPM_BUILD_ROOT
 %files realtek
 %defattr(644,root,root,755)
 %doc WHENCE README.rtw88 LICENCE.rtlwifi_firmware.txt
+%dir /lib/firmware/realtek
+%dir /lib/firmware/realtek/rt1320
+/lib/firmware/realtek/rt1320/rt1320-patch-code-vab.bin
+/lib/firmware/realtek/rt1320/rt1320-patch-code-vc.bin
 /lib/firmware/rtl_bt
 /lib/firmware/rtl_nic
 /lib/firmware/rtlwifi
@@ -1082,6 +1095,7 @@ rm -rf $RPM_BUILD_ROOT
 /lib/firmware/rtw89/rtw8852c_fw-1.bin
 /lib/firmware/rtw89/rtw8922a_fw.bin
 /lib/firmware/rtw89/rtw8922a_fw-1.bin
+/lib/firmware/rtw89/rtw8922a_fw-2.bin
 
 %files ti
 %defattr(644,root,root,755)
@@ -1197,6 +1211,7 @@ rm -rf $RPM_BUILD_ROOT
 /lib/firmware/iwlwifi-ty-a0-gf-a0.pnvm
 # iwlwifi-bz subpackage?
 /lib/firmware/iwlwifi-bz-b0-fm-c0-92.ucode
+/lib/firmware/iwlwifi-bz-b0-fm-c0-94.ucode
 /lib/firmware/iwlwifi-bz-b0-fm-c0.pnvm
 /lib/firmware/iwlwifi-gl-c0-fm-c0-*.ucode
 /lib/firmware/iwlwifi-gl-c0-fm-c0.pnvm
diff --git a/check-files.patch b/check-files.patch
new file mode 100644
index 0000000..2d7496a
--- /dev/null
+++ b/check-files.patch
@@ -0,0 +1,18 @@
+--- linux-firmware-20241017/copy-firmware.sh.orig	2024-10-23 13:41:31.664541337 +0200
++++ linux-firmware-20241017/copy-firmware.sh	2024-10-23 13:51:38.989815246 +0200
+@@ -70,6 +70,7 @@
+ 
+ # shellcheck disable=SC2162 # file/folder name can include escaped symbols
+ grep -E '^(RawFile|File):' WHENCE | sed -E -e 's/^(RawFile|File): */\1 /;s/"//g' | while read k f; do
++    test -e "$f" || continue
+     install -d "$destdir/$(dirname "$f")"
+     $verbose "copying/compressing file $f$compext"
+     if test "$compress" != "cat" && test "$k" = "RawFile"; then
+@@ -82,6 +83,7 @@
+ 
+ # shellcheck disable=SC2162 # file/folder name can include escaped symbols
+ grep -E '^Link:' WHENCE | sed -e 's/^Link: *//g;s/-> //g' | while read l t; do
++    test -e "$(dirname "$l")/$t" || continue
+     directory="$destdir/$(dirname "$l")"
+     install -d "$directory"
+     target="$(cd "$directory" && realpath -m -s "$t")"
diff --git a/disable-check-whence.patch b/disable-check-whence.patch
new file mode 100644
index 0000000..1f3a772
--- /dev/null
+++ b/disable-check-whence.patch
@@ -0,0 +1,13 @@
+--- linux-firmware-20241017/copy-firmware.sh.orig	2024-10-17 14:45:19.000000000 +0200
++++ linux-firmware-20241017/copy-firmware.sh	2024-10-23 13:38:53.742769358 +0200
+@@ -65,8 +65,8 @@
+     find "$destdir" -type d -empty >/dev/null || warn "destination folder is not empty."
+ fi
+ 
+-$verbose "Checking that WHENCE file is formatted properly"
+-./check_whence.py || err "check_whence.py has detected errors."
++#$verbose "Checking that WHENCE file is formatted properly"
++#./check_whence.py || err "check_whence.py has detected errors."
+ 
+ # shellcheck disable=SC2162 # file/folder name can include escaped symbols
+ grep -E '^(RawFile|File):' WHENCE | sed -E -e 's/^(RawFile|File): */\1 /;s/"//g' | while read k f; do
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/linux-firmware.git/commitdiff/99ce4b44d250570686cc15a6eec396cb3fd0e3c9

