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