From 21121facfd1b8acc8cd8678eb14506ee7eb1e21caefe36731fc5e21616224742 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Sat, 18 Mar 2023 07:45:31 +0000 Subject: [PATCH 1/5] Accepting request 1072686 from home:dirkmueller:Factory - set psuffix to deduplicate src.rpms - spec-cleaner induced cleanups OBS-URL: https://build.opensuse.org/request/show/1072686 OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-firmware?expand=0&rev=414 --- kernel-firmware.changes | 6 ++++ kernel-firmware.spec | 61 +++++++++++++++++++++++------------------ kernel-firmware.spec.in | 55 +++++++++++++++++++++---------------- 3 files changed, 71 insertions(+), 51 deletions(-) diff --git a/kernel-firmware.changes b/kernel-firmware.changes index dee9bc7..68e38da 100644 --- a/kernel-firmware.changes +++ b/kernel-firmware.changes @@ -39,6 +39,12 @@ Tue Mar 14 14:50:08 UTC 2023 - tiwai@suse.com - Update aliases - Update spec template +------------------------------------------------------------------- +Tue Mar 14 10:00:21 UTC 2023 - Dirk Müller + +- set psuffix to deduplicate src.rpms +- spec-cleaner induced cleanups + ------------------------------------------------------------------- Mon Feb 13 12:59:21 UTC 2023 - tiwai@suse.com diff --git a/kernel-firmware.spec b/kernel-firmware.spec index 791a7b9..da3df63 100644 --- a/kernel-firmware.spec +++ b/kernel-firmware.spec @@ -1,5 +1,5 @@ # -# spec file for package kernel-firmware +# spec file # # Copyright (c) 2023 SUSE LLC # @@ -17,15 +17,19 @@ %global flavor @BUILD_FLAVOR@%{nil} - %if 0%{?suse_version} < 1550 %define _firmwaredir /lib/firmware %endif - %define __ksyms_path ^%{_firmwaredir} %define version_unconverted 20230313 - -Name: kernel-firmware +%if "%{flavor}" == "compressed" +%global psuffix -compressed +%else +%global psuffix %{nil} +%endif +# Force bzip2 instead of lzma compression (bsc#1176981) +%define _binary_payload w9.bzdio +Name: kernel-firmware%{?psuffix} Version: 20230313 Release: 0 Summary: Linux kernel firmware files @@ -43,7 +47,7 @@ Source2: ast_dp501_fw.bin Source8: ql2600_fw.bin Source9: ql2700_fw.bin Source10: ql8300_fw.bin -Source99: %{name}-rpmlintrc +Source99: kernel-firmware-rpmlintrc # temporary revert (bsc#1202152): taken from upstream commit 06acb465d80b Source100: rtw8822c_fw.bin # install / build infrastructure @@ -66,8 +70,12 @@ Source1100: qcom-post Source1101: uncompressed-post BuildRequires: fdupes BuildRequires: suse-module-tools -Requires(post): /usr/bin/mkdir /usr/bin/touch -Requires(postun):/usr/bin/mkdir /usr/bin/touch +Requires(post): %{_bindir}/mkdir +Requires(post): %{_bindir}/touch +Requires(postun):%{_bindir}/mkdir +Requires(postun):%{_bindir}/touch +Provides: compat-wireless-firmware = 4.4 +Obsoletes: compat-wireless-firmware < 4.4 BuildArch: noarch Provides: ath3k-firmware = %{version} Obsoletes: ath3k-firmware < %{version} @@ -96,16 +104,11 @@ Provides: ralink-firmware = %{version} Obsoletes: ralink-firmware < %{version} Provides: qlogic-firmware = %{version} Obsoletes: qlogic-firmware < %{version} -Provides: compat-wireless-firmware = 4.4 -Obsoletes: compat-wireless-firmware < 4.4 %if 0%{?suse_version} >= 1550 # make sure we have post-usrmerge filesystem package on TW Conflicts: filesystem < 84 %endif -# Force bzip2 instead of lzma compression (bsc#1176981) -%define _binary_payload w9.bzdio - %description This package contains the raw uncompressed firmware files for Linux kernel drivers. This package is provided only for compatibility with older kernels @@ -114,8 +117,10 @@ that do not support the compressed format. %package -n ucode-amd 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(post): %{_bindir}/mkdir +Requires(post): %{_bindir}/touch +Requires(postun):%{_bindir}/mkdir +Requires(postun):%{_bindir}/touch # new style (after 3.12 kernel somewhen) Supplements: modalias(cpu:type%%3Ax86*ven0002*) # old style (before 3.16 kernel) @@ -127,18 +132,16 @@ This package contains the microcode files used by AMD CPUs. %package all 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(post): %{_bindir}/mkdir +Requires(post): %{_bindir}/touch Requires(post): dracut >= 049 +Requires(postun):%{_bindir}/mkdir +Requires(postun):%{_bindir}/touch +Conflicts: kernel < 5.3 Provides: kernel-firmware = %{version} Obsoletes: kernel-firmware <= %{version} -Conflicts: kernel < 5.3 Provides: compat-wireless-firmware = 4.4 Obsoletes: compat-wireless-firmware < 4.4 -%if 0%{?suse_version} >= 1550 -# make sure we have post-usrmerge filesystem package on TW -Conflicts: filesystem < 84 -%endif Requires: %{name}-amdgpu = %{version} Requires: %{name}-ath10k = %{version} Requires: %{name}-ath11k = %{version} @@ -171,6 +174,10 @@ Requires: %{name}-sound = %{version} Requires: %{name}-ti = %{version} Requires: %{name}-ueagle = %{version} Requires: %{name}-usb-network = %{version} +%if 0%{?suse_version} >= 1550 +# make sure we have post-usrmerge filesystem package on TW +Conflicts: filesystem < 84 +%endif %description all This package is a catch-all compatibility metapackage for providing @@ -6317,7 +6324,7 @@ This package contains compressed kernel firmware files for various USB WiFi / Ethernet drivers. %prep -%setup -q +%setup -q -n kernel-firmware-%{version} # additional firmwares cat %{SOURCE1} >> WHENCE cp %{SOURCE2} %{SOURCE8} %{SOURCE9} %{SOURCE10} . @@ -6329,7 +6336,7 @@ install -c -m 0644 %{SOURCE100} rtw88/rtw8822c_fw.bin %install mkdir -p %{buildroot}%{_firmwaredir} -%if "%flavor" != "compressed" +%if "%{flavor}" != "compressed" sh ./copy-firmware.sh %{buildroot}%{_firmwaredir} %else sh %{_sourcedir}/install-split.sh -v %{_sourcedir}/topics.list %{buildroot} %{_firmwaredir} < WHENCE @@ -6337,7 +6344,7 @@ sh %{_sourcedir}/list-license.sh < %{_sourcedir}/licenses.list %endif %fdupes -s %{buildroot} -%if "%flavor" != "compressed" +%if "%{flavor}" != "compressed" %pre # ugly workaround for changing qcom/LENOVO/21BX to a symlink (bsc#1204103) if [ ! -L %{_firmwaredir}/qcom/LENOVO/21BX ]; then @@ -6693,7 +6700,7 @@ fi %{?regenerate_initrd_posttrans} %endif -%if "%flavor" != "compressed" +%if "%{flavor}" != "compressed" %files %doc WHENCE README %license GPL-2 GPL-3 LICEN[CS]E.* @@ -6708,7 +6715,7 @@ fi %{_firmwaredir}/amd-ucode %endif -%if "%flavor" == "compressed" +%if "%{flavor}" == "compressed" %files all %doc WHENCE README diff --git a/kernel-firmware.spec.in b/kernel-firmware.spec.in index d53de8a..356a699 100644 --- a/kernel-firmware.spec.in +++ b/kernel-firmware.spec.in @@ -1,5 +1,5 @@ # -# spec file for package kernel-firmware +# spec file for package kernel-firmware.spec # # Copyright (c) 2023 SUSE LLC # @@ -17,15 +17,19 @@ %global flavor @BUILD_FLAVOR@%{nil} - %if 0%{?suse_version} < 1550 %define _firmwaredir /lib/firmware %endif - %define __ksyms_path ^%{_firmwaredir} %define version_unconverted @@VERSION@@ - -Name: kernel-firmware +%if "%{flavor}" == "compressed" +%global psuffix -compressed +%else +%global psuffix %{nil} +%endif +# Force bzip2 instead of lzma compression (bsc#1176981) +%define _binary_payload w9.bzdio +Name: kernel-firmware%{?psuffix} Version: @@VERSION@@ Release: 0 Summary: Linux kernel firmware files @@ -43,7 +47,7 @@ Source2: ast_dp501_fw.bin Source8: ql2600_fw.bin Source9: ql2700_fw.bin Source10: ql8300_fw.bin -Source99: %{name}-rpmlintrc +Source99: kernel-firmware-rpmlintrc # temporary revert (bsc#1202152): taken from upstream commit 06acb465d80b Source100: rtw8822c_fw.bin # install / build infrastructure @@ -66,20 +70,19 @@ Source1100: qcom-post Source1101: uncompressed-post BuildRequires: fdupes BuildRequires: suse-module-tools -Requires(post): /usr/bin/mkdir /usr/bin/touch -Requires(postun):/usr/bin/mkdir /usr/bin/touch -BuildArch: noarch -@@ALLPROVS@@ +Requires(post): %{_bindir}/mkdir +Requires(post): %{_bindir}/touch +Requires(postun): %{_bindir}/mkdir +Requires(postun): %{_bindir}/touch Provides: compat-wireless-firmware = 4.4 Obsoletes: compat-wireless-firmware < 4.4 +BuildArch: noarch +@@ALLPROVS@@ %if 0%{?suse_version} >= 1550 # make sure we have post-usrmerge filesystem package on TW Conflicts: filesystem < 84 %endif -# Force bzip2 instead of lzma compression (bsc#1176981) -%define _binary_payload w9.bzdio - %description This package contains the raw uncompressed firmware files for Linux kernel drivers. This package is provided only for compatibility with older kernels @@ -88,8 +91,10 @@ that do not support the compressed format. %package -n ucode-amd 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(post): %{_bindir}/mkdir +Requires(post): %{_bindir}/touch +Requires(postun): %{_bindir}/mkdir +Requires(postun): %{_bindir}/touch # new style (after 3.12 kernel somewhen) Supplements: modalias(cpu:type%%3Ax86*ven0002*) # old style (before 3.16 kernel) @@ -101,19 +106,21 @@ This package contains the microcode files used by AMD CPUs. %package all 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(post): %{_bindir}/mkdir +Requires(post): %{_bindir}/touch Requires(post): dracut >= 049 +Requires(postun): %{_bindir}/mkdir +Requires(postun): %{_bindir}/touch +Conflicts: kernel < 5.3 Provides: kernel-firmware = %{version} Obsoletes: kernel-firmware <= %{version} -Conflicts: kernel < 5.3 Provides: compat-wireless-firmware = 4.4 Obsoletes: compat-wireless-firmware < 4.4 +@@SUBPKGLIST@@ %if 0%{?suse_version} >= 1550 # make sure we have post-usrmerge filesystem package on TW Conflicts: filesystem < 84 %endif -@@SUBPKGLIST@@ %description all This package is a catch-all compatibility metapackage for providing @@ -122,7 +129,7 @@ all files that have been provided by kernel-firmware package. @@SUBPACKAGES@@ %prep -%setup -q +%setup -q -n kernel-firmware-%{version} # additional firmwares cat %{SOURCE1} >> WHENCE cp %{SOURCE2} %{SOURCE8} %{SOURCE9} %{SOURCE10} . @@ -134,7 +141,7 @@ install -c -m 0644 %{SOURCE100} rtw88/rtw8822c_fw.bin %install mkdir -p %{buildroot}%{_firmwaredir} -%if "%flavor" != "compressed" +%if "%{flavor}" != "compressed" sh ./copy-firmware.sh %{buildroot}%{_firmwaredir} %else sh %{_sourcedir}/install-split.sh -v %{_sourcedir}/topics.list %{buildroot} %{_firmwaredir} < WHENCE @@ -142,7 +149,7 @@ sh %{_sourcedir}/list-license.sh < %{_sourcedir}/licenses.list %endif %fdupes -s %{buildroot} -%if "%flavor" != "compressed" +%if "%{flavor}" != "compressed" @@POST@@ @@POST@@ -n ucode-amd @@ -152,7 +159,7 @@ sh %{_sourcedir}/list-license.sh < %{_sourcedir}/licenses.list @@SUBPKGPOSTS@@ %endif -%if "%flavor" != "compressed" +%if "%{flavor}" != "compressed" %files %doc WHENCE README %license GPL-2 GPL-3 LICEN[CS]E.* @@ -167,7 +174,7 @@ sh %{_sourcedir}/list-license.sh < %{_sourcedir}/licenses.list %{_firmwaredir}/amd-ucode %endif -%if "%flavor" == "compressed" +%if "%{flavor}" == "compressed" %files all %doc WHENCE README From 6ff9138fa503a1bd543d76df1cc5c87f825f6f5734c55701ac51739c89381ab9 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Mon, 20 Mar 2023 07:47:21 +0000 Subject: [PATCH 2/5] Accepting request 1073038 from home:tiwai:branches:Kernel:HEAD - Revert the broken rtw89/rtw8852b_fw.bin firmware temporarily (bsc#1209449) OBS-URL: https://build.opensuse.org/request/show/1073038 OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-firmware?expand=0&rev=415 --- .gitattributes | 1 + kernel-firmware.changes | 6 ++++++ kernel-firmware.spec | 4 ++++ rtw8852b_fw.bin | 3 +++ 4 files changed, 14 insertions(+) create mode 100644 rtw8852b_fw.bin diff --git a/.gitattributes b/.gitattributes index 17fd394..ff98fa1 100644 --- a/.gitattributes +++ b/.gitattributes @@ -27,3 +27,4 @@ ql2600_fw.bin filter=lfs diff=lfs merge=lfs -text ql2700_fw.bin filter=lfs diff=lfs merge=lfs -text ql8300_fw.bin filter=lfs diff=lfs merge=lfs -text rtw8822c_fw.bin filter=lfs diff=lfs merge=lfs -text +rtw8852b_fw.bin filter=lfs diff=lfs merge=lfs -text diff --git a/kernel-firmware.changes b/kernel-firmware.changes index 68e38da..5525147 100644 --- a/kernel-firmware.changes +++ b/kernel-firmware.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Mar 20 07:29:36 UTC 2023 - Takashi Iwai + +- Revert the broken rtw89/rtw8852b_fw.bin firmware temporarily + (bsc#1209449) + ------------------------------------------------------------------- Tue Mar 14 14:50:08 UTC 2023 - tiwai@suse.com diff --git a/kernel-firmware.spec b/kernel-firmware.spec index da3df63..5fb97d8 100644 --- a/kernel-firmware.spec +++ b/kernel-firmware.spec @@ -50,6 +50,8 @@ Source10: ql8300_fw.bin Source99: kernel-firmware-rpmlintrc # temporary revert (bsc#1202152): taken from upstream commit 06acb465d80b Source100: rtw8822c_fw.bin +# temporary revert (bsc#1209449): taken from upstream commit dae5d4603b07 +Source101: rtw8852b_fw.bin # install / build infrastructure Source1001: install-split.sh Source1002: list-license.sh @@ -6330,6 +6332,8 @@ cat %{SOURCE1} >> WHENCE cp %{SOURCE2} %{SOURCE8} %{SOURCE9} %{SOURCE10} . # temporary revert (bsc#1202152) install -c -m 0644 %{SOURCE100} rtw88/rtw8822c_fw.bin +# temporary revert of rtw89/rtw8852b_fw.bin (bsc#1209449) +install -c -m 0644 %{SOURCE101} rtw89/rtw8852b_fw.bin %build # nothing to do diff --git a/rtw8852b_fw.bin b/rtw8852b_fw.bin new file mode 100644 index 0000000..bb0e692 --- /dev/null +++ b/rtw8852b_fw.bin @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5b9c224ae014e0aeade8701412d820e213c8880e08615b3905dba89659f21baf +size 1035232 From 3f3c444dbdb47a986a2e8825ef26cdd095030fd98175d1487ac47d418bbe61ba Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Tue, 21 Mar 2023 08:49:43 +0000 Subject: [PATCH 3/5] Accepting request 1073461 from home:tiwai:branches:Kernel:HEAD - Revert pssufix change that caused the package renaming and broke dependencies from other packages OBS-URL: https://build.opensuse.org/request/show/1073461 OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-firmware?expand=0&rev=416 --- kernel-firmware.changes | 6 ++++++ kernel-firmware.spec.in | 7 +------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/kernel-firmware.changes b/kernel-firmware.changes index 5525147..3ce712a 100644 --- a/kernel-firmware.changes +++ b/kernel-firmware.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Mar 21 06:01:37 UTC 2023 - Takashi Iwai + +- Revert pssufix change that caused the package renaming and broke + dependencies from other packages + ------------------------------------------------------------------- Mon Mar 20 07:29:36 UTC 2023 - Takashi Iwai diff --git a/kernel-firmware.spec.in b/kernel-firmware.spec.in index 356a699..962b8b5 100644 --- a/kernel-firmware.spec.in +++ b/kernel-firmware.spec.in @@ -22,14 +22,9 @@ %endif %define __ksyms_path ^%{_firmwaredir} %define version_unconverted @@VERSION@@ -%if "%{flavor}" == "compressed" -%global psuffix -compressed -%else -%global psuffix %{nil} -%endif # Force bzip2 instead of lzma compression (bsc#1176981) %define _binary_payload w9.bzdio -Name: kernel-firmware%{?psuffix} +Name: kernel-firmware Version: @@VERSION@@ Release: 0 Summary: Linux kernel firmware files From 8f58e4e80dfe7afcd60a80850cf398fccfc4d1069f945592870e653df6c23162 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Wed, 22 Mar 2023 06:28:52 +0000 Subject: [PATCH 4/5] Accepting request 1073685 from home:tiwai:branches:Kernel:HEAD Fix kernel-firmware.spec, too OBS-URL: https://build.opensuse.org/request/show/1073685 OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-firmware?expand=0&rev=417 --- kernel-firmware.spec | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/kernel-firmware.spec b/kernel-firmware.spec index 5fb97d8..27095c9 100644 --- a/kernel-firmware.spec +++ b/kernel-firmware.spec @@ -1,5 +1,5 @@ # -# spec file +# spec file for package kernel-firmware # # Copyright (c) 2023 SUSE LLC # @@ -22,14 +22,9 @@ %endif %define __ksyms_path ^%{_firmwaredir} %define version_unconverted 20230313 -%if "%{flavor}" == "compressed" -%global psuffix -compressed -%else -%global psuffix %{nil} -%endif # Force bzip2 instead of lzma compression (bsc#1176981) %define _binary_payload w9.bzdio -Name: kernel-firmware%{?psuffix} +Name: kernel-firmware Version: 20230313 Release: 0 Summary: Linux kernel firmware files From 7b07114f52ea44fe1e5dd55adeaacc96e172315377b8d85610a2871a2ccdfb19 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Fri, 24 Mar 2023 09:30:39 +0000 Subject: [PATCH 5/5] Accepting request 1074118 from home:tiwai:branches:Kernel:HEAD - Update to version 20230320 (git commit bcdcfbcf0a8f): * linux-firmware: Update firmware file for Intel Bluetooth AX101 * linux-firmware: Update firmware file for Intel Bluetooth 9462 * linux-firmware: Update firmware file for Intel Bluetooth 9462 * linux-firmware: Update firmware file for Intel Bluetooth 9560 * linux-firmware: Update firmware file for Intel Bluetooth 9560 * linux-firmware: Update firmware file for Intel Bluetooth AX203 * linux-firmware: Update firmware file for Intel Bluetooth AX203 * linux-firmware: Update firmware file for Intel Bluetooth AX211 * linux-firmware: Update firmware file for Intel Bluetooth AX211 * linux-firmware: Update firmware file for Intel Bluetooth AX210 * linux-firmware: add firmware files for NXP BT chipsets * rtw89: 8852b: update format-1 fw to v0.29.29.0 * rtw89: 8852b: add format-1 fw v0.29.26.0 * rtw89: 8852b: rollback firmware to v0.27.32.1 * i915: Update MTL DMC to v2.12 * i915: Update ADLP DMC to v2.19 * mediatek: Update mt8192/mt8195 SCP firmware to support MM21 and MT21 - Update topics list - Drop the manual revert of 8852b firmware file, as it's merged into the upstream OBS-URL: https://build.opensuse.org/request/show/1074118 OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-firmware?expand=0&rev=418 --- .gitattributes | 1 - _servicedata | 2 +- kernel-firmware-20230313.tar.xz | 3 --- kernel-firmware-20230320.tar.xz | 3 +++ kernel-firmware.changes | 25 +++++++++++++++++++++++++ kernel-firmware.spec | 8 ++------ licenses.list | 1 + rtw8852b_fw.bin | 3 --- topics.list | 1 + 9 files changed, 33 insertions(+), 14 deletions(-) delete mode 100644 kernel-firmware-20230313.tar.xz create mode 100644 kernel-firmware-20230320.tar.xz delete mode 100644 rtw8852b_fw.bin diff --git a/.gitattributes b/.gitattributes index ff98fa1..17fd394 100644 --- a/.gitattributes +++ b/.gitattributes @@ -27,4 +27,3 @@ ql2600_fw.bin filter=lfs diff=lfs merge=lfs -text ql2700_fw.bin filter=lfs diff=lfs merge=lfs -text ql8300_fw.bin filter=lfs diff=lfs merge=lfs -text rtw8822c_fw.bin filter=lfs diff=lfs merge=lfs -text -rtw8852b_fw.bin filter=lfs diff=lfs merge=lfs -text diff --git a/_servicedata b/_servicedata index 7dfa0ce..24e331a 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git - 5bc279fb161d529baaf8e837d900235fbbe9bf2f \ No newline at end of file + bcdcfbcf0a8f24a914b8c163906e6ce93d7f8897 \ No newline at end of file diff --git a/kernel-firmware-20230313.tar.xz b/kernel-firmware-20230313.tar.xz deleted file mode 100644 index 3318f04..0000000 --- a/kernel-firmware-20230313.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2606f159eb2a8601b4e82cc107318ce21976a1da7e01f01e231eda4255bb86ba -size 265708100 diff --git a/kernel-firmware-20230320.tar.xz b/kernel-firmware-20230320.tar.xz new file mode 100644 index 0000000..ed06c20 --- /dev/null +++ b/kernel-firmware-20230320.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cded5b89bc9efeae434c196dced65c12cac818f321e0e58152368ea5423d4196 +size 266375688 diff --git a/kernel-firmware.changes b/kernel-firmware.changes index 3ce712a..ed577d2 100644 --- a/kernel-firmware.changes +++ b/kernel-firmware.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Fri Mar 24 08:22:16 UTC 2023 - tiwai@suse.com + +- Update to version 20230320 (git commit bcdcfbcf0a8f): + * linux-firmware: Update firmware file for Intel Bluetooth AX101 + * linux-firmware: Update firmware file for Intel Bluetooth 9462 + * linux-firmware: Update firmware file for Intel Bluetooth 9462 + * linux-firmware: Update firmware file for Intel Bluetooth 9560 + * linux-firmware: Update firmware file for Intel Bluetooth 9560 + * linux-firmware: Update firmware file for Intel Bluetooth AX203 + * linux-firmware: Update firmware file for Intel Bluetooth AX203 + * linux-firmware: Update firmware file for Intel Bluetooth AX211 + * linux-firmware: Update firmware file for Intel Bluetooth AX211 + * linux-firmware: Update firmware file for Intel Bluetooth AX210 + * linux-firmware: add firmware files for NXP BT chipsets + * rtw89: 8852b: update format-1 fw to v0.29.29.0 + * rtw89: 8852b: add format-1 fw v0.29.26.0 + * rtw89: 8852b: rollback firmware to v0.27.32.1 + * i915: Update MTL DMC to v2.12 + * i915: Update ADLP DMC to v2.19 + * mediatek: Update mt8192/mt8195 SCP firmware to support MM21 and MT21 +- Update topics list +- Drop the manual revert of 8852b firmware file, as it's merged into + the upstream + ------------------------------------------------------------------- Tue Mar 21 06:01:37 UTC 2023 - Takashi Iwai diff --git a/kernel-firmware.spec b/kernel-firmware.spec index 27095c9..827e000 100644 --- a/kernel-firmware.spec +++ b/kernel-firmware.spec @@ -21,11 +21,11 @@ %define _firmwaredir /lib/firmware %endif %define __ksyms_path ^%{_firmwaredir} -%define version_unconverted 20230313 +%define version_unconverted 20230320 # Force bzip2 instead of lzma compression (bsc#1176981) %define _binary_payload w9.bzdio Name: kernel-firmware -Version: 20230313 +Version: 20230320 Release: 0 Summary: Linux kernel firmware files License: GPL-2.0-only AND SUSE-Firmware AND GPL-2.0-or-later AND MIT @@ -45,8 +45,6 @@ Source10: ql8300_fw.bin Source99: kernel-firmware-rpmlintrc # temporary revert (bsc#1202152): taken from upstream commit 06acb465d80b Source100: rtw8822c_fw.bin -# temporary revert (bsc#1209449): taken from upstream commit dae5d4603b07 -Source101: rtw8852b_fw.bin # install / build infrastructure Source1001: install-split.sh Source1002: list-license.sh @@ -6327,8 +6325,6 @@ cat %{SOURCE1} >> WHENCE cp %{SOURCE2} %{SOURCE8} %{SOURCE9} %{SOURCE10} . # temporary revert (bsc#1202152) install -c -m 0644 %{SOURCE100} rtw88/rtw8822c_fw.bin -# temporary revert of rtw89/rtw8852b_fw.bin (bsc#1209449) -install -c -m 0644 %{SOURCE101} rtw89/rtw8852b_fw.bin %build # nothing to do diff --git a/licenses.list b/licenses.list index 164e56d..cb138ab 100644 --- a/licenses.list +++ b/licenses.list @@ -183,3 +183,4 @@ amphion: platform LICENSE.amphion_vpu cs35l41_hda: sound LICENSE.cirrus mtk-sof: sound LICENCE.mediatek nxp-sr1xx: platform LICENSE.nxp +btnxpuart: platform LICENSE.nxp \ No newline at end of file diff --git a/rtw8852b_fw.bin b/rtw8852b_fw.bin deleted file mode 100644 index bb0e692..0000000 --- a/rtw8852b_fw.bin +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5b9c224ae014e0aeade8701412d820e213c8880e08615b3905dba89659f21baf -size 1035232 diff --git a/topics.list b/topics.list index 5f36bfc..ca3c067 100644 --- a/topics.list +++ b/topics.list @@ -192,4 +192,5 @@ amphion: platform cs35l41_hda: sound snd-hda-scodec-cs35l41-i2c snd-hda-scodec-cs35l41-spi mtk-sof: sound snd-sof-mt8186 snd-sof-mt8195 nxp-sr1xx: platform +btnxpuart: platform ast: platform