From ab269ea831b47d209c3e50fb8730350b36bace02b8aede517e6049bf95a10ec6 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Mon, 28 Feb 2022 14:20:03 +0000 Subject: [PATCH] Accepting request 958047 from home:tiwai:branches:Kernel:HEAD - Update to version 20220224 (git commit 9cab94f59b23): * Mellanox: Add new mlxsw_spectrum firmware xx.2010.1406 * wfx: update to firmware 3.14 * wfx: add antenna configuration files * wfx: rename silabs/ into wfx/ * linux-firmware: update firmware for mediatek bluetooth chip(MT7921) * linux-firmware: Update firmware patch for Intel Bluetooth 8260 * linux-firmware: Update firmware file for Intel Bluetooth 8265 * linux-firmware: Intel BT 7265: Fix Security Issues (bsc#1195786) - Update license.txt for wfx - Temporary fix for WHENCE for wfx: wfx-WHENCE-fix.diff OBS-URL: https://build.opensuse.org/request/show/958047 OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-firmware?expand=0&rev=369 --- _servicedata | 2 +- kernel-firmware-20220218.tar.xz | 3 --- kernel-firmware-20220224.tar.xz | 3 +++ kernel-firmware.changes | 16 ++++++++++++++++ kernel-firmware.spec | 7 +++++-- licenses.list | 2 +- wfx-WHENCE-fix.diff | 17 +++++++++++++++++ 7 files changed, 43 insertions(+), 7 deletions(-) delete mode 100644 kernel-firmware-20220218.tar.xz create mode 100644 kernel-firmware-20220224.tar.xz create mode 100644 wfx-WHENCE-fix.diff diff --git a/_servicedata b/_servicedata index 366dd81..a6a9877 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git - c53073d4e1485ac9f7cb065db466793c495aead7 \ No newline at end of file + 9cab94f59b2378304935bcb45c7a57d3b22369e4 \ No newline at end of file diff --git a/kernel-firmware-20220218.tar.xz b/kernel-firmware-20220218.tar.xz deleted file mode 100644 index 8fb1f35..0000000 --- a/kernel-firmware-20220218.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:88378ff588bdcf4f7fc53360e93c6e3d362a6ca72132712bb0b73407c8fe12c0 -size 222395992 diff --git a/kernel-firmware-20220224.tar.xz b/kernel-firmware-20220224.tar.xz new file mode 100644 index 0000000..0fc9a00 --- /dev/null +++ b/kernel-firmware-20220224.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d2b9b2f013e03745f239f196e69078974c0f10951191d31ac92c59029d839281 +size 226230480 diff --git a/kernel-firmware.changes b/kernel-firmware.changes index 9847ed9..363fafa 100644 --- a/kernel-firmware.changes +++ b/kernel-firmware.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Mon Feb 28 09:27:51 UTC 2022 - tiwai@suse.com + +- Update to version 20220224 (git commit 9cab94f59b23): + * Mellanox: Add new mlxsw_spectrum firmware xx.2010.1406 + * wfx: update to firmware 3.14 + * wfx: add antenna configuration files + * wfx: rename silabs/ into wfx/ + * linux-firmware: update firmware for mediatek bluetooth chip(MT7921) + * linux-firmware: Update firmware patch for Intel Bluetooth 8260 + * linux-firmware: Update firmware file for Intel Bluetooth 8265 + * linux-firmware: Intel BT 7265: Fix Security Issues (bsc#1195786) +- Update license.txt for wfx +- Temporary fix for WHENCE for wfx: + wfx-WHENCE-fix.diff + ------------------------------------------------------------------- Sun Feb 20 09:41:05 UTC 2022 - tiwai@suse.com diff --git a/kernel-firmware.spec b/kernel-firmware.spec index 3488da7..204c735 100644 --- a/kernel-firmware.spec +++ b/kernel-firmware.spec @@ -23,10 +23,10 @@ %endif %define __ksyms_path ^%{_firmwaredir} -%define version_unconverted 20220218 +%define version_unconverted 20220224 Name: kernel-firmware -Version: 20220218 +Version: 20220224 Release: 0 Summary: Linux kernel firmware files License: SUSE-Firmware AND GPL-2.0-only AND GPL-2.0-or-later AND MIT @@ -59,6 +59,8 @@ 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 @@ -6134,6 +6136,7 @@ various USB WiFi / Ethernet drivers. %prep %setup -q +%patch1 -p1 # additional firmwares cat %{SOURCE1} >> WHENCE cp %{SOURCE2} %{SOURCE8} %{SOURCE9} %{SOURCE10} . diff --git a/licenses.list b/licenses.list index affe448..638ff8f 100644 --- a/licenses.list +++ b/licenses.list @@ -179,7 +179,7 @@ mscc-phy: platform LICENCE.microchip meson-vdec: media LICENSE.amlogic_vdec prestera: prestera LICENCE.Marvell lt9611uxc: platform LICENSE.Lontium -wfx: platform silabs/LICENCE.wf200 +wfx: platform wfx/LICENCE.wf200 wave5: platform LICENCE.cnm rvu_cptpf: platform LICENCE.Marvell amphion: platform LICENSE.amphion_vpu diff --git a/wfx-WHENCE-fix.diff b/wfx-WHENCE-fix.diff new file mode 100644 index 0000000..3c8211e --- /dev/null +++ b/wfx-WHENCE-fix.diff @@ -0,0 +1,17 @@ +diff --git a/WHENCE b/WHENCE +index 07a68814c23b..d7ef4a4d3f7d 100644 +--- a/WHENCE ++++ b/WHENCE +@@ -5848,9 +5848,9 @@ Driver: wfx - Silicon Labs Wi-Fi Transceiver + File: wfx/wfm_wf200_C0.sec + Version: 3.14 + +-File: wfx/brd4001a.pds not listed in WHENCE +-File: wfx/brd8022a.pds not listed in WHENCE +-File: wfx/brd8023a.pds not listed in WHENCE ++File: wfx/brd4001a.pds ++File: wfx/brd8022a.pds ++File: wfx/brd8023a.pds + + Licence: Redistributable. See wfx/LICENCE.wf200 for details. +