From c4d644630a2a1c5a69db52992ad46e12f6d128974734cf3f78edc90cf274dfd2 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Wed, 8 Jun 2022 10:40:21 +0000 Subject: [PATCH] Accepting request 981268 from home:tiwai:branches:Kernel:HEAD - Update to version 20220607 (git commit 02c69863c885): * rtl_bt: Update RTL8852A BT USB firmware to 0xDFB8_0634 * Makefile: replace mkdir by install * iwlwifi: remove old unsupported 3160/7260/7265/8000/8265 firmware * ath11k: WCN6855 hw2.0: update to WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.9 * WHENCE: ath11k: move regdb.bin before board-2.bin * ath10k: QCA9984 hw1.0: update firmware-5.bin to 10.4-3.9.0.2-00157 * ath10k: QCA9888 hw2.0: update board-2.bin * ath10k: QCA9888 hw2.0: update firmware-5.bin to 10.4-3.9.0.2-00157 * ath10k: QCA4019 hw1.0: update board-2.bin * ath10k: WCN3990 hw1.0: add board-2.bin - Update aliases from 5.19-rc1 - Minor adjustment of spec template and makespec.sh to align with the latest TW format OBS-URL: https://build.opensuse.org/request/show/981268 OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-firmware?expand=0&rev=378 --- _servicedata | 2 +- aliases.list | 25 ++++++++++++++++ kernel-firmware-20220516.tar.xz | 3 -- kernel-firmware-20220607.tar.xz | 3 ++ kernel-firmware.changes | 18 +++++++++++ kernel-firmware.spec | 53 +++++++++++++++++++++++++++++++-- kernel-firmware.spec.in | 13 +++++--- makespec.sh | 6 +++- 8 files changed, 112 insertions(+), 11 deletions(-) delete mode 100644 kernel-firmware-20220516.tar.xz create mode 100644 kernel-firmware-20220607.tar.xz diff --git a/_servicedata b/_servicedata index b197130..0c0efce 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git - 251d29004ffce3462779dbd08073a2cd8dfd2087 \ No newline at end of file + 02c69863c885db963f8c0121b533f2816ef5be3b \ No newline at end of file diff --git a/aliases.list b/aliases.list index cf2d099..d879d78 100644 --- a/aliases.list +++ b/aliases.list @@ -290,6 +290,7 @@ amdgpu: pci:v00001002d00007420sv*sd*bc*sc*i* amdgpu: pci:v00001002d00007421sv*sd*bc*sc*i* amdgpu: pci:v00001002d00007422sv*sd*bc*sc*i* amdgpu: pci:v00001002d00007423sv*sd*bc*sc*i* +amdgpu: pci:v00001002d00007424sv*sd*bc*sc*i* amdgpu: pci:v00001002d0000743Fsv*sd*bc*sc*i* amdgpu: pci:v00001002d00009830sv*sd*bc*sc*i* amdgpu: pci:v00001002d00009831sv*sd*bc*sc*i* @@ -1563,6 +1564,16 @@ i915: pci:v00008086d00004E55sv*sd*bc03sc*i* i915: pci:v00008086d00004E57sv*sd*bc03sc*i* i915: pci:v00008086d00004E61sv*sd*bc03sc*i* i915: pci:v00008086d00004E71sv*sd*bc03sc*i* +i915: pci:v00008086d00005690sv*sd*bc03sc*i* +i915: pci:v00008086d00005691sv*sd*bc03sc*i* +i915: pci:v00008086d00005692sv*sd*bc03sc*i* +i915: pci:v00008086d00005693sv*sd*bc03sc*i* +i915: pci:v00008086d00005694sv*sd*bc03sc*i* +i915: pci:v00008086d00005695sv*sd*bc03sc*i* +i915: pci:v00008086d00005696sv*sd*bc03sc*i* +i915: pci:v00008086d00005697sv*sd*bc03sc*i* +i915: pci:v00008086d000056B0sv*sd*bc03sc*i* +i915: pci:v00008086d000056B2sv*sd*bc03sc*i* i915: pci:v00008086d00005902sv*sd*bc03sc*i* i915: pci:v00008086d00005906sv*sd*bc03sc*i* i915: pci:v00008086d00005908sv*sd*bc03sc*i* @@ -1651,12 +1662,20 @@ i915: pci:v00008086d00009BE6sv*sd*bc03sc*i* i915: pci:v00008086d00009BF6sv*sd*bc03sc*i* i915: pci:v00008086d0000A001sv*sd*bc03sc*i* i915: pci:v00008086d0000A011sv*sd*bc03sc*i* +i915: pci:v00008086d0000A720sv*sd*bc03sc*i* +i915: pci:v00008086d0000A721sv*sd*bc03sc*i* i915: pci:v00008086d0000A780sv*sd*bc03sc*i* i915: pci:v00008086d0000A781sv*sd*bc03sc*i* i915: pci:v00008086d0000A782sv*sd*bc03sc*i* i915: pci:v00008086d0000A783sv*sd*bc03sc*i* i915: pci:v00008086d0000A788sv*sd*bc03sc*i* i915: pci:v00008086d0000A789sv*sd*bc03sc*i* +i915: pci:v00008086d0000A78Asv*sd*bc03sc*i* +i915: pci:v00008086d0000A78Bsv*sd*bc03sc*i* +i915: pci:v00008086d0000A7A0sv*sd*bc03sc*i* +i915: pci:v00008086d0000A7A1sv*sd*bc03sc*i* +i915: pci:v00008086d0000A7A8sv*sd*bc03sc*i* +i915: pci:v00008086d0000A7A9sv*sd*bc03sc*i* ib_qib: fs-ipathfs ib_qib: pci:v00001077d00007220sv*sd*bc*sc*i* ib_qib: pci:v00001077d00007322sv*sd*bc*sc*i* @@ -2962,6 +2981,12 @@ nfp: pci:v000019EEd00004000sv000019EEsd*bc*sc*i* nfp: pci:v000019EEd00005000sv000019EEsd*bc*sc*i* nfp: pci:v000019EEd00006000sv000019EEsd*bc*sc*i* nfp: pci:v000019EEd00006003sv000019EEsd*bc*sc*i* +nfp: pci:v00001DA8d00003800sv00001DA8sd*bc*sc*i* +nfp: pci:v00001DA8d00003803sv00001DA8sd*bc*sc*i* +nfp: pci:v00001DA8d00004000sv00001DA8sd*bc*sc*i* +nfp: pci:v00001DA8d00005000sv00001DA8sd*bc*sc*i* +nfp: pci:v00001DA8d00006000sv00001DA8sd*bc*sc*i* +nfp: pci:v00001DA8d00006003sv00001DA8sd*bc*sc*i* nouveau: of:N*T*Cnvidia,gk20a nouveau: of:N*T*Cnvidia,gk20aC* nouveau: of:N*T*Cnvidia,gm20b diff --git a/kernel-firmware-20220516.tar.xz b/kernel-firmware-20220516.tar.xz deleted file mode 100644 index f739c8b..0000000 --- a/kernel-firmware-20220516.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0a73ee74641c77ac80809cce7f45c1b404ec78d6d9b7a2588d07d20fb4811e3e -size 246521788 diff --git a/kernel-firmware-20220607.tar.xz b/kernel-firmware-20220607.tar.xz new file mode 100644 index 0000000..0996d56 --- /dev/null +++ b/kernel-firmware-20220607.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4ac37fcac4b8923be984a903031a012df5fa286dbb8e64a01874de981b83ac28 +size 243126532 diff --git a/kernel-firmware.changes b/kernel-firmware.changes index c2c62ec..f2b267e 100644 --- a/kernel-firmware.changes +++ b/kernel-firmware.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Wed Jun 08 08:06:57 UTC 2022 - tiwai@suse.com + +- Update to version 20220607 (git commit 02c69863c885): + * rtl_bt: Update RTL8852A BT USB firmware to 0xDFB8_0634 + * Makefile: replace mkdir by install + * iwlwifi: remove old unsupported 3160/7260/7265/8000/8265 firmware + * ath11k: WCN6855 hw2.0: update to WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.9 + * WHENCE: ath11k: move regdb.bin before board-2.bin + * ath10k: QCA9984 hw1.0: update firmware-5.bin to 10.4-3.9.0.2-00157 + * ath10k: QCA9888 hw2.0: update board-2.bin + * ath10k: QCA9888 hw2.0: update firmware-5.bin to 10.4-3.9.0.2-00157 + * ath10k: QCA4019 hw1.0: update board-2.bin + * ath10k: WCN3990 hw1.0: add board-2.bin +- Update aliases from 5.19-rc1 +- Minor adjustment of spec template and makespec.sh to align with + the latest TW format + ------------------------------------------------------------------- Tue May 17 09:50:51 UTC 2022 - tiwai@suse.com diff --git a/kernel-firmware.spec b/kernel-firmware.spec index dd367d6..938a8c2 100644 --- a/kernel-firmware.spec +++ b/kernel-firmware.spec @@ -23,10 +23,10 @@ %endif %define __ksyms_path ^%{_firmwaredir} -%define version_unconverted 20220516 +%define version_unconverted 20220607 Name: kernel-firmware -Version: 20220516 +Version: 20220607 Release: 0 Summary: Linux kernel firmware files License: GPL-2.0-only AND SUSE-Firmware AND GPL-2.0-or-later AND MIT @@ -450,6 +450,7 @@ Supplements: modalias(pci:v00001002d00007420sv*sd*bc*sc*i*) Supplements: modalias(pci:v00001002d00007421sv*sd*bc*sc*i*) Supplements: modalias(pci:v00001002d00007422sv*sd*bc*sc*i*) Supplements: modalias(pci:v00001002d00007423sv*sd*bc*sc*i*) +Supplements: modalias(pci:v00001002d00007424sv*sd*bc*sc*i*) Supplements: modalias(pci:v00001002d0000743Fsv*sd*bc*sc*i*) Supplements: modalias(pci:v00001002d00009830sv*sd*bc*sc*i*) Supplements: modalias(pci:v00001002d00009831sv*sd*bc*sc*i*) @@ -1585,6 +1586,16 @@ Supplements: modalias(pci:v00008086d00004E55sv*sd*bc03sc*i*) Supplements: modalias(pci:v00008086d00004E57sv*sd*bc03sc*i*) Supplements: modalias(pci:v00008086d00004E61sv*sd*bc03sc*i*) Supplements: modalias(pci:v00008086d00004E71sv*sd*bc03sc*i*) +Supplements: modalias(pci:v00008086d00005690sv*sd*bc03sc*i*) +Supplements: modalias(pci:v00008086d00005691sv*sd*bc03sc*i*) +Supplements: modalias(pci:v00008086d00005692sv*sd*bc03sc*i*) +Supplements: modalias(pci:v00008086d00005693sv*sd*bc03sc*i*) +Supplements: modalias(pci:v00008086d00005694sv*sd*bc03sc*i*) +Supplements: modalias(pci:v00008086d00005695sv*sd*bc03sc*i*) +Supplements: modalias(pci:v00008086d00005696sv*sd*bc03sc*i*) +Supplements: modalias(pci:v00008086d00005697sv*sd*bc03sc*i*) +Supplements: modalias(pci:v00008086d000056B0sv*sd*bc03sc*i*) +Supplements: modalias(pci:v00008086d000056B2sv*sd*bc03sc*i*) Supplements: modalias(pci:v00008086d00005902sv*sd*bc03sc*i*) Supplements: modalias(pci:v00008086d00005906sv*sd*bc03sc*i*) Supplements: modalias(pci:v00008086d00005908sv*sd*bc03sc*i*) @@ -1673,12 +1684,20 @@ Supplements: modalias(pci:v00008086d00009BE6sv*sd*bc03sc*i*) Supplements: modalias(pci:v00008086d00009BF6sv*sd*bc03sc*i*) Supplements: modalias(pci:v00008086d0000A001sv*sd*bc03sc*i*) Supplements: modalias(pci:v00008086d0000A011sv*sd*bc03sc*i*) +Supplements: modalias(pci:v00008086d0000A720sv*sd*bc03sc*i*) +Supplements: modalias(pci:v00008086d0000A721sv*sd*bc03sc*i*) Supplements: modalias(pci:v00008086d0000A780sv*sd*bc03sc*i*) Supplements: modalias(pci:v00008086d0000A781sv*sd*bc03sc*i*) Supplements: modalias(pci:v00008086d0000A782sv*sd*bc03sc*i*) Supplements: modalias(pci:v00008086d0000A783sv*sd*bc03sc*i*) Supplements: modalias(pci:v00008086d0000A788sv*sd*bc03sc*i*) Supplements: modalias(pci:v00008086d0000A789sv*sd*bc03sc*i*) +Supplements: modalias(pci:v00008086d0000A78Asv*sd*bc03sc*i*) +Supplements: modalias(pci:v00008086d0000A78Bsv*sd*bc03sc*i*) +Supplements: modalias(pci:v00008086d0000A7A0sv*sd*bc03sc*i*) +Supplements: modalias(pci:v00008086d0000A7A1sv*sd*bc03sc*i*) +Supplements: modalias(pci:v00008086d0000A7A8sv*sd*bc03sc*i*) +Supplements: modalias(pci:v00008086d0000A7A9sv*sd*bc03sc*i*) %description i915 This package contains compressed kernel firmware files for @@ -2945,6 +2964,8 @@ Supplements: modalias(of:N*T*Cmediatek,mt7668u-bluetooth) Supplements: modalias(of:N*T*Cmediatek,mt7668u-bluetoothC*) Supplements: modalias(of:N*T*Cmediatek,mt8183-scp) Supplements: modalias(of:N*T*Cmediatek,mt8183-scpC*) +Supplements: modalias(of:N*T*Cmediatek,mt8186-scp) +Supplements: modalias(of:N*T*Cmediatek,mt8186-scpC*) Supplements: modalias(of:N*T*Cmediatek,mt8192-scp) Supplements: modalias(of:N*T*Cmediatek,mt8192-scpC*) Supplements: modalias(of:N*T*Cmediatek,mt8195-scp) @@ -3332,6 +3353,12 @@ Supplements: modalias(pci:v000019EEd00004000sv000019EEsd*bc*sc*i*) Supplements: modalias(pci:v000019EEd00005000sv000019EEsd*bc*sc*i*) Supplements: modalias(pci:v000019EEd00006000sv000019EEsd*bc*sc*i*) Supplements: modalias(pci:v000019EEd00006003sv000019EEsd*bc*sc*i*) +Supplements: modalias(pci:v00001DA8d00003800sv00001DA8sd*bc*sc*i*) +Supplements: modalias(pci:v00001DA8d00003803sv00001DA8sd*bc*sc*i*) +Supplements: modalias(pci:v00001DA8d00004000sv00001DA8sd*bc*sc*i*) +Supplements: modalias(pci:v00001DA8d00005000sv00001DA8sd*bc*sc*i*) +Supplements: modalias(pci:v00001DA8d00006000sv00001DA8sd*bc*sc*i*) +Supplements: modalias(pci:v00001DA8d00006003sv00001DA8sd*bc*sc*i*) %description nfp This package contains compressed kernel firmware files for @@ -3991,12 +4018,20 @@ Supplements: modalias(of:N*T*Cqcom,msm8996-slpi-pil) Supplements: modalias(of:N*T*Cqcom,msm8996-slpi-pilC*) Supplements: modalias(of:N*T*Cqcom,msm8998-adsp-pas) Supplements: modalias(of:N*T*Cqcom,msm8998-adsp-pasC*) +Supplements: modalias(of:N*T*Cqcom,msm8998-dpu) +Supplements: modalias(of:N*T*Cqcom,msm8998-dpuC*) +Supplements: modalias(of:N*T*Cqcom,msm8998-mdss) +Supplements: modalias(of:N*T*Cqcom,msm8998-mdssC*) Supplements: modalias(of:N*T*Cqcom,msm8998-mss-pil) Supplements: modalias(of:N*T*Cqcom,msm8998-mss-pilC*) Supplements: modalias(of:N*T*Cqcom,msm8998-slpi-pas) Supplements: modalias(of:N*T*Cqcom,msm8998-slpi-pasC*) Supplements: modalias(of:N*T*Cqcom,q6v5-pil) Supplements: modalias(of:N*T*Cqcom,q6v5-pilC*) +Supplements: modalias(of:N*T*Cqcom,qcm2290-dpu) +Supplements: modalias(of:N*T*Cqcom,qcm2290-dpuC*) +Supplements: modalias(of:N*T*Cqcom,qcm2290-mdss) +Supplements: modalias(of:N*T*Cqcom,qcm2290-mdssC*) Supplements: modalias(of:N*T*Cqcom,qcs404-adsp-pas) Supplements: modalias(of:N*T*Cqcom,qcs404-adsp-pasC*) Supplements: modalias(of:N*T*Cqcom,qcs404-cdsp-pas) @@ -4023,6 +4058,10 @@ Supplements: modalias(of:N*T*Cqcom,sc8180x-adsp-pas) Supplements: modalias(of:N*T*Cqcom,sc8180x-adsp-pasC*) Supplements: modalias(of:N*T*Cqcom,sc8180x-cdsp-pas) Supplements: modalias(of:N*T*Cqcom,sc8180x-cdsp-pasC*) +Supplements: modalias(of:N*T*Cqcom,sc8180x-dpu) +Supplements: modalias(of:N*T*Cqcom,sc8180x-dpuC*) +Supplements: modalias(of:N*T*Cqcom,sc8180x-mdss) +Supplements: modalias(of:N*T*Cqcom,sc8180x-mdssC*) Supplements: modalias(of:N*T*Cqcom,sc8180x-mpss-pas) Supplements: modalias(of:N*T*Cqcom,sc8180x-mpss-pasC*) Supplements: modalias(of:N*T*Cqcom,sdm660-adsp-pas) @@ -4075,6 +4114,14 @@ Supplements: modalias(of:N*T*Cqcom,sm8350-mpss-pas) Supplements: modalias(of:N*T*Cqcom,sm8350-mpss-pasC*) Supplements: modalias(of:N*T*Cqcom,sm8350-slpi-pas) Supplements: modalias(of:N*T*Cqcom,sm8350-slpi-pasC*) +Supplements: modalias(of:N*T*Cqcom,sm8450-adsp-pas) +Supplements: modalias(of:N*T*Cqcom,sm8450-adsp-pasC*) +Supplements: modalias(of:N*T*Cqcom,sm8450-cdsp-pas) +Supplements: modalias(of:N*T*Cqcom,sm8450-cdsp-pasC*) +Supplements: modalias(of:N*T*Cqcom,sm8450-mpss-pas) +Supplements: modalias(of:N*T*Cqcom,sm8450-mpss-pasC*) +Supplements: modalias(of:N*T*Cqcom,sm8450-slpi-pas) +Supplements: modalias(of:N*T*Cqcom,sm8450-slpi-pasC*) %description qcom This package contains compressed kernel firmware files for @@ -4767,6 +4814,7 @@ Supplements: modalias(pci:v00001002d00007420sv*sd*bc*sc*i*) Supplements: modalias(pci:v00001002d00007421sv*sd*bc*sc*i*) Supplements: modalias(pci:v00001002d00007422sv*sd*bc*sc*i*) Supplements: modalias(pci:v00001002d00007423sv*sd*bc*sc*i*) +Supplements: modalias(pci:v00001002d00007424sv*sd*bc*sc*i*) Supplements: modalias(pci:v00001002d0000743Fsv*sd*bc*sc*i*) Supplements: modalias(pci:v00001002d00007834sv*sd*bc*sc*i*) Supplements: modalias(pci:v00001002d00007835sv*sd*bc*sc*i*) @@ -6574,6 +6622,7 @@ sh %{_sourcedir}/list-license.sh < %{_sourcedir}/licenses.list %files -f files-ueagle ueagle %files -f files-usb-network usb-network + %endif %changelog diff --git a/kernel-firmware.spec.in b/kernel-firmware.spec.in index 7fb2670..74c2e32 100644 --- a/kernel-firmware.spec.in +++ b/kernel-firmware.spec.in @@ -29,7 +29,7 @@ Name: kernel-firmware Version: @@VERSION@@ Release: 0 Summary: Linux kernel firmware files -License: SUSE-Firmware AND GPL-2.0-only AND GPL-2.0-or-later AND MIT +License: GPL-2.0-only AND SUSE-Firmware AND GPL-2.0-or-later AND MIT Group: System/Kernel URL: https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/ # Created with umask 022; cd /_tmp @@ -59,10 +59,12 @@ Source1011: fwtopics.py Source1012: check-topic.py Source1013: update-aliases.py Source1014: README.build +# temporary fix +Patch1: wfx-WHENCE-fix.diff BuildRequires: fdupes BuildRequires: suse-module-tools Requires(post): /usr/bin/mkdir /usr/bin/touch -Requires(postun): /usr/bin/mkdir /usr/bin/touch +Requires(postun):/usr/bin/mkdir /usr/bin/touch BuildArch: noarch @@ALLPROVS@@ Provides: compat-wireless-firmware = 4.4 @@ -84,7 +86,7 @@ that do not support the compressed format. Summary: Microcode updates for AMD CPUs Group: System/Kernel Requires(post): /usr/bin/mkdir /usr/bin/touch -Requires(postun): /usr/bin/mkdir /usr/bin/touch +Requires(postun):/usr/bin/mkdir /usr/bin/touch # new style (after 3.12 kernel somewhen) Supplements: modalias(cpu:type%%3Ax86*ven0002*) # old style (before 3.16 kernel) @@ -97,7 +99,7 @@ This package contains the microcode files used by AMD CPUs. Summary: Compatibility metapackage for kernel firmware files Group: System/Kernel Requires(post): /usr/bin/mkdir /usr/bin/touch -Requires(postun): /usr/bin/mkdir /usr/bin/touch +Requires(postun):/usr/bin/mkdir /usr/bin/touch Requires(post): dracut >= 049 Provides: kernel-firmware = %{version} Obsoletes: kernel-firmware <= %{version} @@ -118,6 +120,7 @@ all files that have been provided by kernel-firmware package. %prep %setup -q +%patch1 -p1 # additional firmwares cat %{SOURCE1} >> WHENCE cp %{SOURCE2} %{SOURCE8} %{SOURCE9} %{SOURCE10} . @@ -137,8 +140,10 @@ sh %{_sourcedir}/list-license.sh < %{_sourcedir}/licenses.list %if "%flavor" != "compressed" @@POST@@ + @@POST@@ -n ucode-amd %else + @@POST@@ all @@SUBPKGPOSTS@@ %endif diff --git a/makespec.sh b/makespec.sh index 94bad8c..4724637 100644 --- a/makespec.sh +++ b/makespec.sh @@ -14,7 +14,7 @@ define_subpackage () { echo "Summary: Kernel firmware files for $desc" echo "Group: System/Kernel" echo "Requires(post): /usr/bin/mkdir /usr/bin/touch" - echo "Requires(postun): /usr/bin/mkdir /usr/bin/touch" + echo "Requires(postun):/usr/bin/mkdir /usr/bin/touch" echo "Requires(post): dracut >= 049" echo "Conflicts: kernel < 5.3" echo "%if 0%{?suse_version} >= 1550" @@ -35,8 +35,10 @@ define_post () { test -n "$l" && l=" $l" echo "%post$l" echo "%{?regenerate_initrd_post}" + echo echo "%postun$l" echo "%{?regenerate_initrd_post}" + echo echo "%posttrans$l" echo "%{?regenerate_initrd_posttrans}" } @@ -65,6 +67,7 @@ sed -e"s/@@VERSION@@/$version/g" | while read line; do esac if [ "$line" = "@@SUBPKGPOSTS@@" ]; then for t in $topics; do + echo define_post $t done continue @@ -72,6 +75,7 @@ sed -e"s/@@VERSION@@/$version/g" | while read line; do if [ "$line" = "@@SUBPKGFILES@@" ]; then for t in $topics; do echo "%files -f files-$t $t" + echo done continue fi