Dominique Leuenberger 2023-03-24 14:19:07 +00:00 committed by Git OBS Bridge
commit 7126e7bd4b
8 changed files with 103 additions and 54 deletions

View File

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

View File

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

View File

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

View File

@ -1,3 +1,40 @@
-------------------------------------------------------------------
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 <tiwai@suse.com>
- Revert pssufix change that caused the package renaming and broke
dependencies from other packages
-------------------------------------------------------------------
Mon Mar 20 07:29:36 UTC 2023 - Takashi Iwai <tiwai@suse.com>
- Revert the broken rtw89/rtw8852b_fw.bin firmware temporarily
(bsc#1209449)
-------------------------------------------------------------------
Tue Mar 14 14:50:08 UTC 2023 - tiwai@suse.com
@ -39,6 +76,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 <dmueller@suse.com>
- set psuffix to deduplicate src.rpms
- spec-cleaner induced cleanups
-------------------------------------------------------------------
Mon Feb 13 12:59:21 UTC 2023 - tiwai@suse.com

View File

@ -17,16 +17,15 @@
%global flavor @BUILD_FLAVOR@%{nil}
%if 0%{?suse_version} < 1550
%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
@ -43,7 +42,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 +65,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 +99,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 +112,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 +127,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 +169,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 +6319,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 +6331,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 +6339,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 +6695,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 +6710,7 @@ fi
%{_firmwaredir}/amd-ucode
%endif
%if "%flavor" == "compressed"
%if "%{flavor}" == "compressed"
%files all
%doc WHENCE README

View File

@ -1,5 +1,5 @@
#
# spec file for package kernel-firmware
# spec file for package kernel-firmware.spec
#
# Copyright (c) 2023 SUSE LLC
#
@ -17,14 +17,13 @@
%global flavor @BUILD_FLAVOR@%{nil}
%if 0%{?suse_version} < 1550
%define _firmwaredir /lib/firmware
%endif
%define __ksyms_path ^%{_firmwaredir}
%define version_unconverted @@VERSION@@
# Force bzip2 instead of lzma compression (bsc#1176981)
%define _binary_payload w9.bzdio
Name: kernel-firmware
Version: @@VERSION@@
Release: 0
@ -43,7 +42,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 +65,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 +86,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 +101,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 +124,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 +136,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 +144,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 +154,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 +169,7 @@ sh %{_sourcedir}/list-license.sh < %{_sourcedir}/licenses.list
%{_firmwaredir}/amd-ucode
%endif
%if "%flavor" == "compressed"
%if "%{flavor}" == "compressed"
%files all
%doc WHENCE README

View File

@ -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

View File

@ -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