pool/kernel-firmware
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1072686 from home:dirkmueller:Factory

Browse Source 
- 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
This commit is contained in:
Takashi Iwai 2023-03-18 07:45:31 +00:00 committed by Git OBS Bridge
parent 266e01983e
commit 21121facfd
3 changed files with 71 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kernel-firmware.changes
View File

@ -39,6 +39,12 @@ Tue Mar 14 14:50:08 UTC 2023 - tiwai@suse.com
- Update aliases - Update aliases
- Update spec template - 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 Mon Feb 13 12:59:21 UTC 2023 - tiwai@suse.com

61
kernel-firmware.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package kernel-firmware # spec file
# #
# Copyright (c) 2023 SUSE LLC # Copyright (c) 2023 SUSE LLC
# #
@ -17,15 +17,19 @@
%global flavor @BUILD_FLAVOR@%{nil} %global flavor @BUILD_FLAVOR@%{nil}
%if 0%{?suse_version} < 1550 %if 0%{?suse_version} < 1550
%define _firmwaredir /lib/firmware %define _firmwaredir /lib/firmware
%endif %endif
%define __ksyms_path ^%{_firmwaredir} %define __ksyms_path ^%{_firmwaredir}
%define version_unconverted 20230313 %define version_unconverted 20230313
%if "%{flavor}" == "compressed"
Name: kernel-firmware %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 Version: 20230313
Release: 0 Release: 0
Summary: Linux kernel firmware files Summary: Linux kernel firmware files
@ -43,7 +47,7 @@ Source2: ast_dp501_fw.bin
Source8: ql2600_fw.bin Source8: ql2600_fw.bin
Source9: ql2700_fw.bin Source9: ql2700_fw.bin
Source10: ql8300_fw.bin Source10: ql8300_fw.bin
Source99: %{name}-rpmlintrc Source99: kernel-firmware-rpmlintrc
# temporary revert (bsc#1202152): taken from upstream commit 06acb465d80b # temporary revert (bsc#1202152): taken from upstream commit 06acb465d80b
Source100: rtw8822c_fw.bin Source100: rtw8822c_fw.bin
# install / build infrastructure # install / build infrastructure
@ -66,8 +70,12 @@ Source1100: qcom-post
Source1101: uncompressed-post Source1101: uncompressed-post
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: suse-module-tools BuildRequires: suse-module-tools
Requires(post): /usr/bin/mkdir /usr/bin/touch Requires(post): %{_bindir}/mkdir
Requires(postun):/usr/bin/mkdir /usr/bin/touch 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 BuildArch: noarch
Provides: ath3k-firmware = %{version} Provides: ath3k-firmware = %{version}
Obsoletes: ath3k-firmware < %{version} Obsoletes: ath3k-firmware < %{version}
@ -96,16 +104,11 @@ Provides: ralink-firmware = %{version}
Obsoletes: ralink-firmware < %{version} Obsoletes: ralink-firmware < %{version}
Provides: qlogic-firmware = %{version} Provides: qlogic-firmware = %{version}
Obsoletes: qlogic-firmware < %{version} Obsoletes: qlogic-firmware < %{version}
Provides: compat-wireless-firmware = 4.4
Obsoletes: compat-wireless-firmware < 4.4
%if 0%{?suse_version} >= 1550 %if 0%{?suse_version} >= 1550
# make sure we have post-usrmerge filesystem package on TW # make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84 Conflicts: filesystem < 84
%endif %endif
# Force bzip2 instead of lzma compression (bsc#1176981)
%define _binary_payload w9.bzdio
%description %description
This package contains the raw uncompressed firmware files for Linux kernel This package contains the raw uncompressed firmware files for Linux kernel
drivers. This package is provided only for compatibility with older kernels 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 %package -n ucode-amd
Summary: Microcode updates for AMD CPUs Summary: Microcode updates for AMD CPUs
Group: System/Kernel Group: System/Kernel
Requires(post): /usr/bin/mkdir /usr/bin/touch Requires(post): %{_bindir}/mkdir
Requires(postun):/usr/bin/mkdir /usr/bin/touch Requires(post): %{_bindir}/touch
Requires(postun):%{_bindir}/mkdir
Requires(postun):%{_bindir}/touch
# new style (after 3.12 kernel somewhen) # new style (after 3.12 kernel somewhen)
Supplements: modalias(cpu:type%%3Ax86*ven0002*) Supplements: modalias(cpu:type%%3Ax86*ven0002*)
# old style (before 3.16 kernel) # old style (before 3.16 kernel)
@ -127,18 +132,16 @@ This package contains the microcode files used by AMD CPUs.
%package all %package all
Summary: Compatibility metapackage for kernel firmware files Summary: Compatibility metapackage for kernel firmware files
Group: System/Kernel Group: System/Kernel
Requires(post): /usr/bin/mkdir /usr/bin/touch Requires(post): %{_bindir}/mkdir
Requires(postun):/usr/bin/mkdir /usr/bin/touch Requires(post): %{_bindir}/touch
Requires(post): dracut >= 049 Requires(post): dracut >= 049
Requires(postun):%{_bindir}/mkdir
Requires(postun):%{_bindir}/touch
Conflicts: kernel < 5.3
Provides: kernel-firmware = %{version} Provides: kernel-firmware = %{version}
Obsoletes: kernel-firmware <= %{version} Obsoletes: kernel-firmware <= %{version}
Conflicts: kernel < 5.3
Provides: compat-wireless-firmware = 4.4 Provides: compat-wireless-firmware = 4.4
Obsoletes: 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}-amdgpu = %{version}
Requires: %{name}-ath10k = %{version} Requires: %{name}-ath10k = %{version}
Requires: %{name}-ath11k = %{version} Requires: %{name}-ath11k = %{version}
@ -171,6 +174,10 @@ Requires: %{name}-sound = %{version}
Requires: %{name}-ti = %{version} Requires: %{name}-ti = %{version}
Requires: %{name}-ueagle = %{version} Requires: %{name}-ueagle = %{version}
Requires: %{name}-usb-network = %{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 %description all
This package is a catch-all compatibility metapackage for providing 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. various USB WiFi / Ethernet drivers.
%prep %prep
%setup -q %setup -q -n kernel-firmware-%{version}
# additional firmwares # additional firmwares
cat %{SOURCE1} >> WHENCE cat %{SOURCE1} >> WHENCE
cp %{SOURCE2} %{SOURCE8} %{SOURCE9} %{SOURCE10} . cp %{SOURCE2} %{SOURCE8} %{SOURCE9} %{SOURCE10} .
@ -6329,7 +6336,7 @@ install -c -m 0644 %{SOURCE100} rtw88/rtw8822c_fw.bin
%install %install
mkdir -p %{buildroot}%{_firmwaredir} mkdir -p %{buildroot}%{_firmwaredir}
%if "%flavor" != "compressed" %if "%{flavor}" != "compressed"
sh ./copy-firmware.sh %{buildroot}%{_firmwaredir} sh ./copy-firmware.sh %{buildroot}%{_firmwaredir}
%else %else
sh %{_sourcedir}/install-split.sh -v %{_sourcedir}/topics.list %{buildroot} %{_firmwaredir} < WHENCE 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 %endif
%fdupes -s %{buildroot} %fdupes -s %{buildroot}
%if "%flavor" != "compressed" %if "%{flavor}" != "compressed"
%pre %pre
# ugly workaround for changing qcom/LENOVO/21BX to a symlink (bsc#1204103) # ugly workaround for changing qcom/LENOVO/21BX to a symlink (bsc#1204103)
if [ ! -L %{_firmwaredir}/qcom/LENOVO/21BX ]; then if [ ! -L %{_firmwaredir}/qcom/LENOVO/21BX ]; then
@ -6693,7 +6700,7 @@ fi
%{?regenerate_initrd_posttrans} %{?regenerate_initrd_posttrans}
%endif %endif
%if "%flavor" != "compressed" %if "%{flavor}" != "compressed"
%files %files
%doc WHENCE README %doc WHENCE README
%license GPL-2 GPL-3 LICEN[CS]E.* %license GPL-2 GPL-3 LICEN[CS]E.*
@ -6708,7 +6715,7 @@ fi
%{_firmwaredir}/amd-ucode %{_firmwaredir}/amd-ucode
%endif %endif
%if "%flavor" == "compressed" %if "%{flavor}" == "compressed"
%files all %files all
%doc WHENCE README %doc WHENCE README

55
kernel-firmware.spec.in
View File

@ -1,5 +1,5 @@
# #
# spec file for package kernel-firmware # spec file for package kernel-firmware.spec
# #
# Copyright (c) 2023 SUSE LLC # Copyright (c) 2023 SUSE LLC
# #
@ -17,15 +17,19 @@
%global flavor @BUILD_FLAVOR@%{nil} %global flavor @BUILD_FLAVOR@%{nil}
%if 0%{?suse_version} < 1550 %if 0%{?suse_version} < 1550
%define _firmwaredir /lib/firmware %define _firmwaredir /lib/firmware
%endif %endif
%define __ksyms_path ^%{_firmwaredir} %define __ksyms_path ^%{_firmwaredir}
%define version_unconverted @@VERSION@@ %define version_unconverted @@VERSION@@
%if "%{flavor}" == "compressed"
Name: kernel-firmware %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@@ Version: @@VERSION@@
Release: 0 Release: 0
Summary: Linux kernel firmware files Summary: Linux kernel firmware files
@ -43,7 +47,7 @@ Source2: ast_dp501_fw.bin
Source8: ql2600_fw.bin Source8: ql2600_fw.bin
Source9: ql2700_fw.bin Source9: ql2700_fw.bin
Source10: ql8300_fw.bin Source10: ql8300_fw.bin
Source99: %{name}-rpmlintrc Source99: kernel-firmware-rpmlintrc
# temporary revert (bsc#1202152): taken from upstream commit 06acb465d80b # temporary revert (bsc#1202152): taken from upstream commit 06acb465d80b
Source100: rtw8822c_fw.bin Source100: rtw8822c_fw.bin
# install / build infrastructure # install / build infrastructure
@ -66,20 +70,19 @@ Source1100: qcom-post
Source1101: uncompressed-post Source1101: uncompressed-post
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: suse-module-tools BuildRequires: suse-module-tools
Requires(post): /usr/bin/mkdir /usr/bin/touch Requires(post): %{_bindir}/mkdir
Requires(postun):/usr/bin/mkdir /usr/bin/touch Requires(post): %{_bindir}/touch
BuildArch: noarch Requires(postun): %{_bindir}/mkdir
@@ALLPROVS@@ Requires(postun): %{_bindir}/touch
Provides: compat-wireless-firmware = 4.4 Provides: compat-wireless-firmware = 4.4
Obsoletes: compat-wireless-firmware < 4.4 Obsoletes: compat-wireless-firmware < 4.4
BuildArch: noarch
@@ALLPROVS@@
%if 0%{?suse_version} >= 1550 %if 0%{?suse_version} >= 1550
# make sure we have post-usrmerge filesystem package on TW # make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84 Conflicts: filesystem < 84
%endif %endif
# Force bzip2 instead of lzma compression (bsc#1176981)
%define _binary_payload w9.bzdio
%description %description
This package contains the raw uncompressed firmware files for Linux kernel This package contains the raw uncompressed firmware files for Linux kernel
drivers. This package is provided only for compatibility with older kernels 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 %package -n ucode-amd
Summary: Microcode updates for AMD CPUs Summary: Microcode updates for AMD CPUs
Group: System/Kernel Group: System/Kernel
Requires(post): /usr/bin/mkdir /usr/bin/touch Requires(post): %{_bindir}/mkdir
Requires(postun):/usr/bin/mkdir /usr/bin/touch Requires(post): %{_bindir}/touch
Requires(postun): %{_bindir}/mkdir
Requires(postun): %{_bindir}/touch
# new style (after 3.12 kernel somewhen) # new style (after 3.12 kernel somewhen)
Supplements: modalias(cpu:type%%3Ax86*ven0002*) Supplements: modalias(cpu:type%%3Ax86*ven0002*)
# old style (before 3.16 kernel) # old style (before 3.16 kernel)
@ -101,19 +106,21 @@ This package contains the microcode files used by AMD CPUs.
%package all %package all
Summary: Compatibility metapackage for kernel firmware files Summary: Compatibility metapackage for kernel firmware files
Group: System/Kernel Group: System/Kernel
Requires(post): /usr/bin/mkdir /usr/bin/touch Requires(post): %{_bindir}/mkdir
Requires(postun):/usr/bin/mkdir /usr/bin/touch Requires(post): %{_bindir}/touch
Requires(post): dracut >= 049 Requires(post): dracut >= 049
Requires(postun): %{_bindir}/mkdir
Requires(postun): %{_bindir}/touch
Conflicts: kernel < 5.3
Provides: kernel-firmware = %{version} Provides: kernel-firmware = %{version}
Obsoletes: kernel-firmware <= %{version} Obsoletes: kernel-firmware <= %{version}
Conflicts: kernel < 5.3
Provides: compat-wireless-firmware = 4.4 Provides: compat-wireless-firmware = 4.4
Obsoletes: compat-wireless-firmware < 4.4 Obsoletes: compat-wireless-firmware < 4.4
@@SUBPKGLIST@@
%if 0%{?suse_version} >= 1550 %if 0%{?suse_version} >= 1550
# make sure we have post-usrmerge filesystem package on TW # make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84 Conflicts: filesystem < 84
%endif %endif
@@SUBPKGLIST@@
%description all %description all
This package is a catch-all compatibility metapackage for providing 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@@ @@SUBPACKAGES@@
%prep %prep
%setup -q %setup -q -n kernel-firmware-%{version}
# additional firmwares # additional firmwares
cat %{SOURCE1} >> WHENCE cat %{SOURCE1} >> WHENCE
cp %{SOURCE2} %{SOURCE8} %{SOURCE9} %{SOURCE10} . cp %{SOURCE2} %{SOURCE8} %{SOURCE9} %{SOURCE10} .
@ -134,7 +141,7 @@ install -c -m 0644 %{SOURCE100} rtw88/rtw8822c_fw.bin
%install %install
mkdir -p %{buildroot}%{_firmwaredir} mkdir -p %{buildroot}%{_firmwaredir}
%if "%flavor" != "compressed" %if "%{flavor}" != "compressed"
sh ./copy-firmware.sh %{buildroot}%{_firmwaredir} sh ./copy-firmware.sh %{buildroot}%{_firmwaredir}
%else %else
sh %{_sourcedir}/install-split.sh -v %{_sourcedir}/topics.list %{buildroot} %{_firmwaredir} < WHENCE 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 %endif
%fdupes -s %{buildroot} %fdupes -s %{buildroot}
%if "%flavor" != "compressed" %if "%{flavor}" != "compressed"
@@POST@@ @@POST@@
@@POST@@ -n ucode-amd @@POST@@ -n ucode-amd
@ -152,7 +159,7 @@ sh %{_sourcedir}/list-license.sh < %{_sourcedir}/licenses.list
@@SUBPKGPOSTS@@ @@SUBPKGPOSTS@@
%endif %endif
%if "%flavor" != "compressed" %if "%{flavor}" != "compressed"
%files %files
%doc WHENCE README %doc WHENCE README
%license GPL-2 GPL-3 LICEN[CS]E.* %license GPL-2 GPL-3 LICEN[CS]E.*
@ -167,7 +174,7 @@ sh %{_sourcedir}/list-license.sh < %{_sourcedir}/licenses.list
%{_firmwaredir}/amd-ucode %{_firmwaredir}/amd-ucode
%endif %endif
%if "%flavor" == "compressed" %if "%{flavor}" == "compressed"
%files all %files all
%doc WHENCE README %doc WHENCE README