Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package kernel-firmware for openSUSE:Factory
checked in at 2023-10-12 23:39:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kernel-firmware (Old)
and /work/SRC/openSUSE:Factory/.kernel-firmware.new.1807 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kernel-firmware"
Thu Oct 12 23:39:15 2023 rev:213 rq:1117167 version:20231006
Changes:
--------
--- /work/SRC/openSUSE:Factory/kernel-firmware/kernel-firmware.changes
2023-08-31 13:43:19.807102389 +0200
+++
/work/SRC/openSUSE:Factory/.kernel-firmware.new.1807/kernel-firmware.changes
2023-10-12 23:39:50.483972279 +0200
@@ -1,0 +2,80 @@
+Thu Oct 12 09:53:05 UTC 2023 - Takashi Iwai <[email protected]>
+
+- Add Provides to sub-packages from kernel-firmware (bsc#1214789);
+ this will work around the potential conflicts of compressed vs
+ uncompressed installations
+
+-------------------------------------------------------------------
+Mon Oct 09 07:10:37 UTC 2023 - [email protected]
+
+- Update to version 20231006 (git commit 389575a8a177) (jsc#PED-6130,
jsc#PED-6081):
+ * WHENCE: add symlink for BananaPi M64
+ * linux-firmware: Add firmware file for Intel Bluetooth AX211
+ * linux-firmware: Update firmware file for Intel Bluetooth AX201
+ * linux-firmware: Update firmware file for Intel Bluetooth AX201
+ * 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: Update firmware file for Intel Bluetooth 9560
+ * linux-firmware: Update firmware file for Intel Bluetooth 9260
+ * Build debian and fedora images
+ * Add new Makefile target to build a deb and rpm package
+ * i915: Update MTL DMC to v2.17
+ * iwlwifi: add FWs for new GL and MA device types with multiple RF modules
+ * amd_pmf: Add initial PMF TA for Smart PC Solution Builder
+ * linux-firmware: Update FW files for MRVL PCIE 8997 chipsets
+ * rtl_bt: Update RTL8851B BT USB firmware to 0x048A_D230
+ * iwlwifi: add new FWs from core81-65 release
+ * iwlwifi: update cc/Qu/QuZ firmwares for core81-65 release
+- Drop fdupes to avoid missing files for split packages (bsc#1215464)
+- Add conflicts to each split subpk against uncompressed raw package;
+ the contents may conflict and the compressed files won't be effective
+ unless the raw files get removed
+- Update aliases
+
+-------------------------------------------------------------------
+Fri Sep 22 12:53:05 UTC 2023 - [email protected]
+
+- Update to version 20230918 (commit f48da6da5507):
+ * Run merge request pipelines for pre-commit.
+ * linux-firmware: amd-ucode: Add note on fam19h warnings
+ * i915: update MTL HuC to version 8.5.4
+ * amdgpu: update DMCUB to 0.0.183.0 for various AMDGPU ASICs
+
+-------------------------------------------------------------------
+Thu Sep 14 12:44:20 UTC 2023 - [email protected]
+
+- Update to version 20230907 (git commit c801b3b807d2):
+ * Turn off textwidth check
+ * linux-firmware: add link to sc8280xp audioreach firmware
+ * qcom: sm8250: add RB5 sensors DSP firmware
+ * qcom: Update vpu-1.0 firmware
+ * qcom: sm8250: update DSP firmware
+ * qcom: add firmware for the onboard WiFi on qcm2290 / qrb4210
+ * qcom: add venus firmware files for v6.0
+ * qcom: add firmware for QRB4210 platforms
+ * qcom: add firmware for QCM2290 platforms
+ * qcom: add GPU firmware for QCM2290 / QRB2210
+ * ath10k/WCN3990: move wlanmdsp to qcom/sdm845
+ * WHENCE: Don't compress qcom json files
+ * WHENCE: amd-ucode: Use new RawFile keyword
+ * check_whence: Recognize RawFile keyword
+ * Only run ci-fairy on merge requests
+ * Capture artifacts from `make dist` to save at release time.
+ * Add new toplevel 'make dist' target.
+ * Create symlinks for all firmware that is duplicate using rdfind
+ * QCA: Update Bluetooth WCN685x 2.1 firmware to 2.1.0-00605
+ * Add shellcheck pre-commit target
+ * Fix carl9170fw shell scripts for shellcheck errors
+ * Add a rule for automatic tagging releases by pipeline schedule
+ * Add gitlab ci for calling pre-commit and ci-fairy
+ * Add Dockerfile used to build CI image
+ * Rewrite README in markdown
+ * Wire up pre-commit to `make check`
+ * Add pre-commit hooks and codespell template
+ * check_whence: reformat using python black
+- Drop obsoleted amd-ucode-rawfile.patch
+- Fix make-files.sh to handle RawFile tag correctly
+- Update aliases from 6.6-rc1
+
+-------------------------------------------------------------------
@@ -281,0 +362,7 @@
+
+-------------------------------------------------------------------
+Fri Mar 24 16:08:17 UTC 2023 - Takashi Iwai <[email protected]>
+
+- Revive the old iwlwifi-*-71 ucode for compatibility with
+ SLE15-SP4 kernel (bsc#1209681):
+ WHENCE updated by iwlwifi-WHENCE-fix.patch
Old:
----
amd-ucode-rawfile.patch
kernel-firmware-20230829.tar.xz
New:
----
iwlwifi-Qu-b0-hr-b0-71.ucode
iwlwifi-Qu-b0-jf-b0-71.ucode
iwlwifi-Qu-c0-hr-b0-71.ucode
iwlwifi-Qu-c0-jf-b0-71.ucode
iwlwifi-QuZ-a0-hr-b0-71.ucode
iwlwifi-QuZ-a0-jf-b0-71.ucode
iwlwifi-WHENCE-fix.patch
iwlwifi-cc-a0-71.ucode
iwlwifi-so-a0-gf-a0-71.ucode
iwlwifi-so-a0-gf4-a0-71.ucode
iwlwifi-so-a0-hr-b0-71.ucode
iwlwifi-so-a0-jf-b0-71.ucode
iwlwifi-ty-a0-gf-a0-71.ucode
kernel-firmware-20231006.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kernel-firmware.spec ++++++
--- /var/tmp/diff_new_pack.khLUR8/_old 2023-10-12 23:39:52.696052352 +0200
+++ /var/tmp/diff_new_pack.khLUR8/_new 2023-10-12 23:39:52.700052497 +0200
@@ -21,11 +21,11 @@
%define _firmwaredir /lib/firmware
%endif
%define __ksyms_path ^%{_firmwaredir}
-%define version_unconverted 20230829
+%define version_unconverted 20231006
# Force bzip2 instead of lzma compression (bsc#1176981)
%define _binary_payload w9.bzdio
Name: kernel-firmware
-Version: 20230829
+Version: 20231006
Release: 0
Summary: Linux kernel firmware files
License: GPL-2.0-only AND SUSE-Firmware AND GPL-2.0-or-later AND MIT
@@ -39,6 +39,19 @@
Source9: ql2700_fw.bin
Source10: ql8300_fw.bin
Source99: kernel-firmware-rpmlintrc
+# for compatibility with SLE15-SP4 kernel (bsc#1209681)
+Source200: iwlwifi-cc-a0-71.ucode
+Source201: iwlwifi-Qu-b0-hr-b0-71.ucode
+Source202: iwlwifi-Qu-b0-jf-b0-71.ucode
+Source203: iwlwifi-Qu-c0-hr-b0-71.ucode
+Source204: iwlwifi-Qu-c0-jf-b0-71.ucode
+Source205: iwlwifi-QuZ-a0-hr-b0-71.ucode
+Source206: iwlwifi-QuZ-a0-jf-b0-71.ucode
+Source207: iwlwifi-so-a0-gf4-a0-71.ucode
+Source208: iwlwifi-so-a0-gf-a0-71.ucode
+Source209: iwlwifi-so-a0-hr-b0-71.ucode
+Source210: iwlwifi-so-a0-jf-b0-71.ucode
+Source211: iwlwifi-ty-a0-gf-a0-71.ucode
# install / build infrastructure
Source1001: make-files.sh
Source1002: list-license.sh
@@ -59,8 +72,8 @@
Source1101: uncompressed-post
# workarounds
Patch1: copy-file-ignore-README.patch
-Patch2: amd-ucode-rawfile.patch
-BuildRequires: fdupes
+# for compatibility with SLE15-SP4 kernel (bsc#1209681)
+Patch200: iwlwifi-WHENCE-fix.patch
BuildRequires: suse-module-tools
Requires(post): %{_bindir}/mkdir
Requires(post): %{_bindir}/touch
@@ -100,6 +113,41 @@
# make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84
%endif
+%if "%{flavor}" == "uncompressed"
+Provides: %{name}-amdgpu = %{version}
+Provides: %{name}-ath10k = %{version}
+Provides: %{name}-ath11k = %{version}
+Provides: %{name}-atheros = %{version}
+Provides: %{name}-bluetooth = %{version}
+Provides: %{name}-bnx2 = %{version}
+Provides: %{name}-brcm = %{version}
+Provides: %{name}-chelsio = %{version}
+Provides: %{name}-dpaa2 = %{version}
+Provides: %{name}-i915 = %{version}
+Provides: %{name}-intel = %{version}
+Provides: %{name}-iwlwifi = %{version}
+Provides: %{name}-liquidio = %{version}
+Provides: %{name}-marvell = %{version}
+Provides: %{name}-media = %{version}
+Provides: %{name}-mediatek = %{version}
+Provides: %{name}-mellanox = %{version}
+Provides: %{name}-mwifiex = %{version}
+Provides: %{name}-network = %{version}
+Provides: %{name}-nfp = %{version}
+Provides: %{name}-nvidia = %{version}
+Provides: %{name}-platform = %{version}
+Provides: %{name}-prestera = %{version}
+Provides: %{name}-qcom = %{version}
+Provides: %{name}-qlogic = %{version}
+Provides: %{name}-radeon = %{version}
+Provides: %{name}-realtek = %{version}
+Provides: %{name}-serial = %{version}
+Provides: %{name}-sound = %{version}
+Provides: %{name}-ti = %{version}
+Provides: %{name}-ueagle = %{version}
+Provides: %{name}-usb-network = %{version}
+Provides: kernel-firmware-uncompressed = %{version}
+%endif
%description
This package contains the raw uncompressed firmware files for Linux kernel
@@ -182,6 +230,8 @@
Requires(postun):/usr/bin/mkdir /usr/bin/touch
Requires(post): dracut >= 049
Conflicts: kernel < 5.3
+Conflicts: kernel-firmware < %{version}
+Conflicts: kernel-firmware-uncompressed
%if 0%{?suse_version} >= 1550
# make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84
@@ -505,6 +555,8 @@
Requires(postun):/usr/bin/mkdir /usr/bin/touch
Requires(post): dracut >= 049
Conflicts: kernel < 5.3
+Conflicts: kernel-firmware < %{version}
+Conflicts: kernel-firmware-uncompressed
%if 0%{?suse_version} >= 1550
# make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84
@@ -535,6 +587,8 @@
Requires(postun):/usr/bin/mkdir /usr/bin/touch
Requires(post): dracut >= 049
Conflicts: kernel < 5.3
+Conflicts: kernel-firmware < %{version}
+Conflicts: kernel-firmware-uncompressed
%if 0%{?suse_version} >= 1550
# make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84
@@ -554,6 +608,8 @@
Requires(postun):/usr/bin/mkdir /usr/bin/touch
Requires(post): dracut >= 049
Conflicts: kernel < 5.3
+Conflicts: kernel-firmware < %{version}
+Conflicts: kernel-firmware-uncompressed
%if 0%{?suse_version} >= 1550
# make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84
@@ -759,6 +815,8 @@
Requires(postun):/usr/bin/mkdir /usr/bin/touch
Requires(post): dracut >= 049
Conflicts: kernel < 5.3
+Conflicts: kernel-firmware < %{version}
+Conflicts: kernel-firmware-uncompressed
%if 0%{?suse_version} >= 1550
# make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84
@@ -813,6 +871,8 @@
Requires(postun):/usr/bin/mkdir /usr/bin/touch
Requires(post): dracut >= 049
Conflicts: kernel < 5.3
+Conflicts: kernel-firmware < %{version}
+Conflicts: kernel-firmware-uncompressed
%if 0%{?suse_version} >= 1550
# make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84
@@ -864,6 +924,8 @@
Requires(postun):/usr/bin/mkdir /usr/bin/touch
Requires(post): dracut >= 049
Conflicts: kernel < 5.3
+Conflicts: kernel-firmware < %{version}
+Conflicts: kernel-firmware-uncompressed
%if 0%{?suse_version} >= 1550
# make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84
@@ -944,6 +1006,8 @@
Requires(postun):/usr/bin/mkdir /usr/bin/touch
Requires(post): dracut >= 049
Conflicts: kernel < 5.3
+Conflicts: kernel-firmware < %{version}
+Conflicts: kernel-firmware-uncompressed
%if 0%{?suse_version} >= 1550
# make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84
@@ -1335,6 +1399,8 @@
Requires(postun):/usr/bin/mkdir /usr/bin/touch
Requires(post): dracut >= 049
Conflicts: kernel < 5.3
+Conflicts: kernel-firmware < %{version}
+Conflicts: kernel-firmware-uncompressed
%if 0%{?suse_version} >= 1550
# make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84
@@ -1351,6 +1417,8 @@
Requires(postun):/usr/bin/mkdir /usr/bin/touch
Requires(post): dracut >= 049
Conflicts: kernel < 5.3
+Conflicts: kernel-firmware < %{version}
+Conflicts: kernel-firmware-uncompressed
%if 0%{?suse_version} >= 1550
# make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84
@@ -1740,6 +1808,8 @@
Requires(postun):/usr/bin/mkdir /usr/bin/touch
Requires(post): dracut >= 049
Conflicts: kernel < 5.3
+Conflicts: kernel-firmware < %{version}
+Conflicts: kernel-firmware-uncompressed
%if 0%{?suse_version} >= 1550
# make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84
@@ -1774,6 +1844,8 @@
Requires(postun):/usr/bin/mkdir /usr/bin/touch
Requires(post): dracut >= 049
Conflicts: kernel < 5.3
+Conflicts: kernel-firmware < %{version}
+Conflicts: kernel-firmware-uncompressed
%if 0%{?suse_version} >= 1550
# make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84
@@ -2720,6 +2792,8 @@
Requires(postun):/usr/bin/mkdir /usr/bin/touch
Requires(post): dracut >= 049
Conflicts: kernel < 5.3
+Conflicts: kernel-firmware < %{version}
+Conflicts: kernel-firmware-uncompressed
%if 0%{?suse_version} >= 1550
# make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84
@@ -2739,6 +2813,8 @@
Requires(postun):/usr/bin/mkdir /usr/bin/touch
Requires(post): dracut >= 049
Conflicts: kernel < 5.3
+Conflicts: kernel-firmware < %{version}
+Conflicts: kernel-firmware-uncompressed
%if 0%{?suse_version} >= 1550
# make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84
@@ -2781,6 +2857,8 @@
Requires(postun):/usr/bin/mkdir /usr/bin/touch
Requires(post): dracut >= 049
Conflicts: kernel < 5.3
+Conflicts: kernel-firmware < %{version}
+Conflicts: kernel-firmware-uncompressed
%if 0%{?suse_version} >= 1550
# make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84
@@ -2972,6 +3050,8 @@
Requires(postun):/usr/bin/mkdir /usr/bin/touch
Requires(post): dracut >= 049
Conflicts: kernel < 5.3
+Conflicts: kernel-firmware < %{version}
+Conflicts: kernel-firmware-uncompressed
%if 0%{?suse_version} >= 1550
# make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84
@@ -3073,6 +3153,8 @@
Requires(postun):/usr/bin/mkdir /usr/bin/touch
Requires(post): dracut >= 049
Conflicts: kernel < 5.3
+Conflicts: kernel-firmware < %{version}
+Conflicts: kernel-firmware-uncompressed
%if 0%{?suse_version} >= 1550
# make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84
@@ -3093,6 +3175,8 @@
Requires(postun):/usr/bin/mkdir /usr/bin/touch
Requires(post): dracut >= 049
Conflicts: kernel < 5.3
+Conflicts: kernel-firmware < %{version}
+Conflicts: kernel-firmware-uncompressed
%if 0%{?suse_version} >= 1550
# make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84
@@ -3140,6 +3224,8 @@
Requires(postun):/usr/bin/mkdir /usr/bin/touch
Requires(post): dracut >= 049
Conflicts: kernel < 5.3
+Conflicts: kernel-firmware < %{version}
+Conflicts: kernel-firmware-uncompressed
%if 0%{?suse_version} >= 1550
# make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84
@@ -3367,6 +3453,8 @@
Requires(postun):/usr/bin/mkdir /usr/bin/touch
Requires(post): dracut >= 049
Conflicts: kernel < 5.3
+Conflicts: kernel-firmware < %{version}
+Conflicts: kernel-firmware-uncompressed
%if 0%{?suse_version} >= 1550
# make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84
@@ -3395,6 +3483,8 @@
Requires(postun):/usr/bin/mkdir /usr/bin/touch
Requires(post): dracut >= 049
Conflicts: kernel < 5.3
+Conflicts: kernel-firmware < %{version}
+Conflicts: kernel-firmware-uncompressed
%if 0%{?suse_version} >= 1550
# make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84
@@ -3515,10 +3605,15 @@
Requires(postun):/usr/bin/mkdir /usr/bin/touch
Requires(post): dracut >= 049
Conflicts: kernel < 5.3
+Conflicts: kernel-firmware < %{version}
+Conflicts: kernel-firmware-uncompressed
%if 0%{?suse_version} >= 1550
# make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84
%endif
+Supplements: modalias(acpi*:AMDI0100%3A*)
+Supplements: modalias(acpi*:AMDI0102%3A*)
+Supplements: modalias(acpi*:AMDI0103%3A*)
Supplements: modalias(acpi*:AMDI0C00%3A*)
Supplements: modalias(eisa:sABP7401*)
Supplements: modalias(eisa:sABP7501*)
@@ -4025,6 +4120,8 @@
Requires(postun):/usr/bin/mkdir /usr/bin/touch
Requires(post): dracut >= 049
Conflicts: kernel < 5.3
+Conflicts: kernel-firmware < %{version}
+Conflicts: kernel-firmware-uncompressed
%if 0%{?suse_version} >= 1550
# make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84
@@ -4041,6 +4138,8 @@
Requires(postun):/usr/bin/mkdir /usr/bin/touch
Requires(post): dracut >= 049
Conflicts: kernel < 5.3
+Conflicts: kernel-firmware < %{version}
+Conflicts: kernel-firmware-uncompressed
%if 0%{?suse_version} >= 1550
# make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84
@@ -4237,6 +4336,8 @@
Requires(postun):/usr/bin/mkdir /usr/bin/touch
Requires(post): dracut >= 049
Conflicts: kernel < 5.3
+Conflicts: kernel-firmware < %{version}
+Conflicts: kernel-firmware-uncompressed
%if 0%{?suse_version} >= 1550
# make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84
@@ -4313,6 +4414,8 @@
Requires(postun):/usr/bin/mkdir /usr/bin/touch
Requires(post): dracut >= 049
Conflicts: kernel < 5.3
+Conflicts: kernel-firmware < %{version}
+Conflicts: kernel-firmware-uncompressed
%if 0%{?suse_version} >= 1550
# make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84
@@ -5186,6 +5289,8 @@
Requires(postun):/usr/bin/mkdir /usr/bin/touch
Requires(post): dracut >= 049
Conflicts: kernel < 5.3
+Conflicts: kernel-firmware < %{version}
+Conflicts: kernel-firmware-uncompressed
%if 0%{?suse_version} >= 1550
# make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84
@@ -5849,6 +5954,7 @@
Supplements: modalias(usb:v2001p3C22d*dc*dsc*dp*ic*isc*ip*in*)
Supplements: modalias(usb:v2001p3C23d*dc*dsc*dp*ic*isc*ip*in*)
Supplements: modalias(usb:v2001p3C25d*dc*dsc*dp*ic*isc*ip*in*)
+Supplements: modalias(usb:v2001pB301d*dc*dsc*dp*ic*isc*ip*in*)
Supplements: modalias(usb:v2019p1201d*dc*dsc*dp*ic*isc*ip*in*)
Supplements: modalias(usb:v2019p1201d*dc*dsc*dp*icFFiscFFipFFin*)
Supplements: modalias(usb:v2019p4901d*dc*dsc*dp*ic*isc*ip*in*)
@@ -5949,6 +6055,8 @@
Requires(postun):/usr/bin/mkdir /usr/bin/touch
Requires(post): dracut >= 049
Conflicts: kernel < 5.3
+Conflicts: kernel-firmware < %{version}
+Conflicts: kernel-firmware-uncompressed
%if 0%{?suse_version} >= 1550
# make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84
@@ -6123,6 +6231,8 @@
Requires(postun):/usr/bin/mkdir /usr/bin/touch
Requires(post): dracut >= 049
Conflicts: kernel < 5.3
+Conflicts: kernel-firmware < %{version}
+Conflicts: kernel-firmware-uncompressed
%if 0%{?suse_version} >= 1550
# make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84
@@ -6194,6 +6304,8 @@
Requires(postun):/usr/bin/mkdir /usr/bin/touch
Requires(post): dracut >= 049
Conflicts: kernel < 5.3
+Conflicts: kernel-firmware < %{version}
+Conflicts: kernel-firmware-uncompressed
%if 0%{?suse_version} >= 1550
# make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84
@@ -6212,6 +6324,8 @@
Requires(postun):/usr/bin/mkdir /usr/bin/touch
Requires(post): dracut >= 049
Conflicts: kernel < 5.3
+Conflicts: kernel-firmware < %{version}
+Conflicts: kernel-firmware-uncompressed
%if 0%{?suse_version} >= 1550
# make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84
@@ -6262,6 +6376,8 @@
Requires(postun):/usr/bin/mkdir /usr/bin/touch
Requires(post): dracut >= 049
Conflicts: kernel < 5.3
+Conflicts: kernel-firmware < %{version}
+Conflicts: kernel-firmware-uncompressed
%if 0%{?suse_version} >= 1550
# make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84
@@ -6389,11 +6505,27 @@
%prep
%setup -q -n kernel-firmware-%{version}
%patch1 -p1
-%patch2 -p1
# additional firmwares
cat %{SOURCE1} >> WHENCE
cp %{SOURCE2} %{SOURCE8} %{SOURCE9} %{SOURCE10} .
+%if 0%{?suse_version} < 1599
+# revive old iwlwifi firmware for compatibility (bsc#1209681)
+%patch200 -p1
+cp %{SOURCE200} .
+cp %{SOURCE201} .
+cp %{SOURCE202} .
+cp %{SOURCE203} .
+cp %{SOURCE204} .
+cp %{SOURCE205} .
+cp %{SOURCE206} .
+cp %{SOURCE207} .
+cp %{SOURCE208} .
+cp %{SOURCE209} .
+cp %{SOURCE210} .
+cp %{SOURCE211} .
+%endif
+
%build
# nothing to do
@@ -6406,7 +6538,6 @@
sh %{_sourcedir}/make-files.sh -v %{_sourcedir}/topics.list %{buildroot}
%{_firmwaredir} < WHENCE
sh %{_sourcedir}/list-license.sh < %{_sourcedir}/licenses.list
%endif
-%fdupes -s %{buildroot}
%if "%{flavor}" == "uncompressed"
%pre
@@ -6766,7 +6897,7 @@
%if "%{flavor}" == "uncompressed"
%files
-%doc WHENCE README
+%doc WHENCE README.md
%license GPL-2 GPL-3 LICEN[CS]E.*
%{_firmwaredir}
%exclude %{_firmwaredir}/amd-ucode
@@ -6775,7 +6906,7 @@
%else
%files all
-%doc WHENCE README
+%doc WHENCE README.md
%files -n ucode-amd
%doc amd-ucode/README
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.khLUR8/_old 2023-10-12 23:39:52.808056407 +0200
+++ /var/tmp/diff_new_pack.khLUR8/_new 2023-10-12 23:39:52.812056552 +0200
@@ -1,6 +1,6 @@
<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">49f9e3479fb564ab96ebbfef327743b0ec2a7620</param></service></servicedata>
+ <param
name="changesrevision">389575a8a1773b857bd7176cc42143471226f982</param></service></servicedata>
(No newline at EOF)
++++++ aliases.list ++++++
--- /var/tmp/diff_new_pack.khLUR8/_old 2023-10-12 23:39:52.844057710 +0200
+++ /var/tmp/diff_new_pack.khLUR8/_new 2023-10-12 23:39:52.848057855 +0200
@@ -24,6 +24,9 @@
advansys: pci:v000010CDd00002700sv*sd*bc*sc*i*
ambassador: pci:v000010B6d00001001sv*sd*bc*sc*i*
ambassador: pci:v000010B6d00001002sv*sd*bc*sc*i*
+amd_pmf: acpi*:AMDI0100%3A*
+amd_pmf: acpi*:AMDI0102%3A*
+amd_pmf: acpi*:AMDI0103%3A*
amdgpu: pci:v00001002d*sv*sd*bc03sc00i00*
amdgpu: pci:v00001002d*sv*sd*bc03sc80i00*
amdgpu: pci:v00001002d*sv*sd*bc12sc00i00*
@@ -3523,6 +3526,7 @@
r8152: usb:v17EFpA387d*dc*dsc*dp*ic*isc*ip*in*
r8152: usb:v17EFpA387d*dc*dsc*dp*ic02isc06ip00in*
r8152: usb:v17EFpA387d*dc*dsc*dp*icFFisc*ip*in*
+r8152: usb:v2001pB301d*dc*dsc*dp*ic*isc*ip*in*
r8152: usb:v2357p0601d*dc*dsc*dp*ic*isc*ip*in*
r8152: usb:v2357p0601d*dc*dsc*dp*ic02isc06ip00in*
r8152: usb:v2357p0601d*dc*dsc*dp*icFFisc*ip*in*
++++++ iwlwifi-WHENCE-fix.patch ++++++
diff --git a/WHENCE b/WHENCE
index cf805e28f5a7..16a9f1d78d57 100644
--- a/WHENCE
+++ b/WHENCE
@@ -908,6 +908,42 @@ Version: 66.f1c864e0.0
File: iwlwifi-ty-a0-gf-a0-66.ucode
Version: 66.f1c864e0.0
+File: iwlwifi-cc-a0-71.ucode
+Version: 71.058653f6.0
+
+File: iwlwifi-Qu-b0-hr-b0-71.ucode
+Version: 71.058653f6.0
+
+File: iwlwifi-Qu-b0-jf-b0-71.ucode
+Version: 71.058653f6.0
+
+File: iwlwifi-Qu-c0-hr-b0-71.ucode
+Version: 71.058653f6.0
+
+File: iwlwifi-Qu-c0-jf-b0-71.ucode
+Version: 71.058653f6.0
+
+File: iwlwifi-QuZ-a0-hr-b0-71.ucode
+Version: 71.058653f6.0
+
+File: iwlwifi-QuZ-a0-jf-b0-71.ucode
+Version: 71.058653f6.0
+
+File: iwlwifi-ty-a0-gf-a0-71.ucode
+Version: 71.058653f6.0
+
+File: iwlwifi-so-a0-gf4-a0-71.ucode
+Version: 71.058653f6.0
+
+File: iwlwifi-so-a0-gf-a0-71.ucode
+Version: 71.058653f6.0
+
+File: iwlwifi-so-a0-hr-b0-71.ucode
+Version: 71.058653f6.0
+
+File: iwlwifi-so-a0-jf-b0-71.ucode
+Version: 71.058653f6.0
+
File: iwlwifi-cc-a0-72.ucode
Version: 72.daa05125.0
++++++ kernel-firmware-20230829.tar.xz -> kernel-firmware-20231006.tar.xz ++++++
/work/SRC/openSUSE:Factory/kernel-firmware/kernel-firmware-20230829.tar.xz
/work/SRC/openSUSE:Factory/.kernel-firmware.new.1807/kernel-firmware-20231006.tar.xz
differ: char 26, line 1
++++++ kernel-firmware.spec.in ++++++
--- /var/tmp/diff_new_pack.khLUR8/_old 2023-10-12 23:39:53.076066108 +0200
+++ /var/tmp/diff_new_pack.khLUR8/_new 2023-10-12 23:39:53.076066108 +0200
@@ -39,6 +39,19 @@
Source9: ql2700_fw.bin
Source10: ql8300_fw.bin
Source99: kernel-firmware-rpmlintrc
+# for compatibility with SLE15-SP4 kernel (bsc#1209681)
+Source200: iwlwifi-cc-a0-71.ucode
+Source201: iwlwifi-Qu-b0-hr-b0-71.ucode
+Source202: iwlwifi-Qu-b0-jf-b0-71.ucode
+Source203: iwlwifi-Qu-c0-hr-b0-71.ucode
+Source204: iwlwifi-Qu-c0-jf-b0-71.ucode
+Source205: iwlwifi-QuZ-a0-hr-b0-71.ucode
+Source206: iwlwifi-QuZ-a0-jf-b0-71.ucode
+Source207: iwlwifi-so-a0-gf4-a0-71.ucode
+Source208: iwlwifi-so-a0-gf-a0-71.ucode
+Source209: iwlwifi-so-a0-hr-b0-71.ucode
+Source210: iwlwifi-so-a0-jf-b0-71.ucode
+Source211: iwlwifi-ty-a0-gf-a0-71.ucode
# install / build infrastructure
Source1001: make-files.sh
Source1002: list-license.sh
@@ -59,8 +72,8 @@
Source1101: uncompressed-post
# workarounds
Patch1: copy-file-ignore-README.patch
-Patch2: amd-ucode-rawfile.patch
-BuildRequires: fdupes
+# for compatibility with SLE15-SP4 kernel (bsc#1209681)
+Patch200: iwlwifi-WHENCE-fix.patch
BuildRequires: suse-module-tools
Requires(post): %{_bindir}/mkdir
Requires(post): %{_bindir}/touch
@@ -74,6 +87,10 @@
# make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84
%endif
+%if "%{flavor}" == "uncompressed"
+Provides: kernel-firmware-uncompressed = %{version}
+@@SUBPKGPROVS@@
+%endif
%description
This package contains the raw uncompressed firmware files for Linux kernel
@@ -123,11 +140,27 @@
%prep
%setup -q -n kernel-firmware-%{version}
%patch1 -p1
-%patch2 -p1
# additional firmwares
cat %{SOURCE1} >> WHENCE
cp %{SOURCE2} %{SOURCE8} %{SOURCE9} %{SOURCE10} .
+%if 0%{?suse_version} < 1599
+# revive old iwlwifi firmware for compatibility (bsc#1209681)
+%patch200 -p1
+cp %{SOURCE200} .
+cp %{SOURCE201} .
+cp %{SOURCE202} .
+cp %{SOURCE203} .
+cp %{SOURCE204} .
+cp %{SOURCE205} .
+cp %{SOURCE206} .
+cp %{SOURCE207} .
+cp %{SOURCE208} .
+cp %{SOURCE209} .
+cp %{SOURCE210} .
+cp %{SOURCE211} .
+%endif
+
%build
# nothing to do
@@ -140,7 +173,6 @@
sh %{_sourcedir}/make-files.sh -v %{_sourcedir}/topics.list %{buildroot}
%{_firmwaredir} < WHENCE
sh %{_sourcedir}/list-license.sh < %{_sourcedir}/licenses.list
%endif
-%fdupes -s %{buildroot}
%if "%{flavor}" == "uncompressed"
@@POST@@
@@ -153,7 +185,7 @@
%if "%{flavor}" == "uncompressed"
%files
-%doc WHENCE README
+%doc WHENCE README.md
%license GPL-2 GPL-3 LICEN[CS]E.*
%{_firmwaredir}
%exclude %{_firmwaredir}/amd-ucode
@@ -161,7 +193,7 @@
%else
%files all
-%doc WHENCE README
+%doc WHENCE README.md
%files -n ucode-amd
%doc amd-ucode/README
++++++ make-files.sh ++++++
--- /var/tmp/diff_new_pack.khLUR8/_old 2023-10-12 23:39:53.116067556 +0200
+++ /var/tmp/diff_new_pack.khLUR8/_new 2023-10-12 23:39:53.120067701 +0200
@@ -41,17 +41,10 @@
fi
}
-copy_link () {
+add_file () {
local f="$1"
- local lf="$2"
- local src="${f%/*}"
- if [ "$src" = "$f" ]; then
- src="$lf"
- else
- src="$src/$lf"
- fi
make_dirs "$f"
- if [ -d "$dest/$src" ]; then
+ if [ -f "$dest/$f" ]; then
echo "\"$fwdir/$f\"" >> files-$topic
else
echo "\"$fwdir/$f$cext\"" >> files-$topic
@@ -89,13 +82,12 @@
echo "ERROR: no topic found for $l"
exit 1
fi
- f=$(echo "$l" | sed -e's/^File: *//' -e's/"//g' -e's/\\//g')
+ f=$(echo "$l" | sed -e's/^File: *//' -e's/^RawFile: *//' -e's/"//g'
-e's/\\//g')
case "$f" in
- */README)
+ */README*)
continue;;
esac
- make_dirs "$f"
- echo "\"$fwdir/$f$cext\"" >> files-$topic
+ add_file "$f"
;;
Link:*)
test "$topic" = "SKIP" && continue
@@ -104,8 +96,7 @@
exit 1
fi
f=$(echo "$l" | sed -e's/^Link: *//' -e's/ *->.*$//' -es'/\\//g')
- d=$(echo "$l" | sed -e's/^.*-> *//' -e's/\\//g')
- copy_link "$f" "$d"
+ add_file "$f"
;;
esac
done
++++++ makespec.sh ++++++
--- /var/tmp/diff_new_pack.khLUR8/_old 2023-10-12 23:39:53.136068280 +0200
+++ /var/tmp/diff_new_pack.khLUR8/_new 2023-10-12 23:39:53.136068280 +0200
@@ -18,6 +18,8 @@
echo "Requires(postun):/usr/bin/mkdir /usr/bin/touch"
echo "Requires(post): dracut >= 049"
echo "Conflicts: kernel < 5.3"
+ echo "Conflicts: kernel-firmware-uncompressed"
+ echo "Conflicts: kernel-firmware < %{version}"
echo "%if 0%{?suse_version} >= 1550"
echo "# make sure we have post-usrmerge filesystem package on TW"
echo "Conflicts: filesystem < 84"
@@ -63,6 +65,12 @@
done
continue
fi
+ if [ "$line" = "@@SUBPKGPROVS@@" ]; then
+ for t in $topics; do
+ echo "Provides: %{name}-$t = %{version}"
+ done
+ continue
+ fi
if [ "$line" = "@@SUBPACKAGES@@" ]; then
for t in $topics; do
define_subpackage $t
++++++ topics.list ++++++
--- /var/tmp/diff_new_pack.khLUR8/_old 2023-10-12 23:39:53.220071321 +0200
+++ /var/tmp/diff_new_pack.khLUR8/_new 2023-10-12 23:39:53.220071321 +0200
@@ -73,6 +73,7 @@
r128: platform
radeon: radeon radeon amdgpu
amdgpu: amdgpu
+amd_pmf: platform
s2255drv: platform
rtl8192e: realtek r8192e_pci
lgs8gxx: media
