Ana Guerrero 2024-09-17 16:17:13 +00:00 committed by Git OBS Bridge
commit 72fc372924
8 changed files with 25 additions and 29 deletions

1
.gitattributes vendored
View File

@ -23,6 +23,7 @@
*.zst filter=lfs diff=lfs merge=lfs -text *.zst filter=lfs diff=lfs merge=lfs -text
## Specific LFS patterns ## Specific LFS patterns
ast_dp501_fw.bin filter=lfs diff=lfs merge=lfs -text ast_dp501_fw.bin filter=lfs diff=lfs merge=lfs -text
board-2.bin.gfb04a7f filter=lfs diff=lfs merge=lfs -text
iwlwifi-Qu-b0-hr-b0-71.ucode filter=lfs diff=lfs merge=lfs -text iwlwifi-Qu-b0-hr-b0-71.ucode filter=lfs diff=lfs merge=lfs -text
iwlwifi-Qu-b0-jf-b0-71.ucode filter=lfs diff=lfs merge=lfs -text iwlwifi-Qu-b0-jf-b0-71.ucode filter=lfs diff=lfs merge=lfs -text
iwlwifi-Qu-c0-hr-b0-71.ucode filter=lfs diff=lfs merge=lfs -text iwlwifi-Qu-c0-hr-b0-71.ucode filter=lfs diff=lfs merge=lfs -text

View File

@ -1,4 +1,4 @@
<servicedata> <servicedata>
<service name="tar_scm"> <service name="tar_scm">
<param name="url">https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git</param> <param name="url">https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git</param>
<param name="changesrevision">47c72fee8fe391504e0da1dd99081d8cd76d8856</param></service></servicedata> <param name="changesrevision">bcbdd1670bc34d8044e1c1d4b88a5df30f901ec1</param></service></servicedata>

3
board-2.bin.gfb04a7f Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:92357946083541fc3370a152df57cb5a74cd28adcdc78339e57d8c98e42526cd
size 382856

View File

@ -1,21 +0,0 @@
diff --git a/copy-firmware.sh b/copy-firmware.sh
index 6757c6ce03a3..fc096dd6daf0 100755
--- a/copy-firmware.sh
+++ b/copy-firmware.sh
@@ -136,9 +136,15 @@ grep -E '^Link:' WHENCE | sed -e 's/^Link: *//g;s/-> //g' | while read f d; do
if test -d "$target"; then
$verbose "creating link $f -> $d"
ln -s "$d" "$destdir/$f"
- else
+ elif test -f "$target$compext"; then
$verbose "creating link $f$compext -> $d$compext"
ln -s "$d$compext" "$destdir/$f$compext"
+ elif test -f "$target"; then
+ $verbose "creating link $f -> $d"
+ ln -s "$d" "$destdir/$f"
+ else
+ $verbose "creating link (not yet existing) $f$compext -> $d$compext"
+ ln -s "$d$compext" "$destdir/$f$compext"
fi
fi
done

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b7690f26dab802fc99dfd594e36d5e88b6c7b0a7650ffe60b53049faf0232cfc
size 386463016

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:461d743639b984ff850ebb1c96fd6cb799ce79e4bff8882e4f09451075822b59
size 386467428

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Mon Sep 16 13:15:53 UTC 2024 - tiwai@suse.com
- Update to version 20240913 (git commit bcbdd1670bc3):
* amdgpu: update DMCUB to v0.0.233.0 DCN351
* copy-firmware: Handle links to uncompressed files
* WHENCE: Fix battmgr.jsn entry type
- Drop obsoleted workaround patch:
copy-firmware-fix-symlink-without-compress.patch
- Temporary revert for ath12k firmware (bsc#1230596)
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Sep 13 07:44:25 UTC 2024 - tiwai@suse.com Fri Sep 13 07:44:25 UTC 2024 - tiwai@suse.com

View File

@ -21,11 +21,11 @@
%define _firmwaredir /lib/firmware %define _firmwaredir /lib/firmware
%endif %endif
%define __ksyms_path ^%{_firmwaredir} %define __ksyms_path ^%{_firmwaredir}
%define version_unconverted 20240912 %define version_unconverted 20240913
# Force bzip2 instead of lzma compression (bsc#1176981) # Force bzip2 instead of lzma compression (bsc#1176981)
%define _binary_payload w9.bzdio %define _binary_payload w9.bzdio
Name: kernel-firmware Name: kernel-firmware
Version: 20240912 Version: 20240913
Release: 0 Release: 0
Summary: Linux kernel firmware files Summary: Linux kernel firmware files
License: GPL-2.0-only AND SUSE-Firmware AND GPL-2.0-or-later AND MIT License: GPL-2.0-only AND SUSE-Firmware AND GPL-2.0-or-later AND MIT
@ -70,9 +70,10 @@ Source1014: README.build
# workarounds # workarounds
Source1100: qcom-post Source1100: qcom-post
Source1101: uncompressed-post Source1101: uncompressed-post
# temporary revert for ath12k firmware (bsc#1230596)
Source1200: board-2.bin.gfb04a7f
# workarounds # workarounds
Patch1: copy-file-ignore-README.patch Patch1: copy-file-ignore-README.patch
Patch2: copy-firmware-fix-symlink-without-compress.patch
# for compatibility with SLE15-SP4 kernel (bsc#1209681) # for compatibility with SLE15-SP4 kernel (bsc#1209681)
Patch200: iwlwifi-WHENCE-fix.patch Patch200: iwlwifi-WHENCE-fix.patch
BuildRequires: suse-module-tools BuildRequires: suse-module-tools
@ -6722,7 +6723,6 @@ various USB WiFi / Ethernet drivers.
%prep %prep
%setup -q -n kernel-firmware-%{version} %setup -q -n kernel-firmware-%{version}
%patch -P 1 -p1 %patch -P 1 -p1
%patch -P 2 -p1
# additional firmwares # additional firmwares
cat %{SOURCE1} >> WHENCE cat %{SOURCE1} >> WHENCE
cp %{SOURCE2} %{SOURCE8} %{SOURCE9} %{SOURCE10} . cp %{SOURCE2} %{SOURCE8} %{SOURCE9} %{SOURCE10} .
@ -6743,6 +6743,8 @@ cp %{SOURCE209} .
cp %{SOURCE210} . cp %{SOURCE210} .
cp %{SOURCE211} . cp %{SOURCE211} .
%endif %endif
# temporary revert for ath12k firmware (bsc#1230596)
cp %{SOURCE1200} ath12k/WCN7850/hw2.0/board-2.bin
%build %build
# nothing to do # nothing to do