Sync changes to SLFO-1.2 branch

aliases

@@ -272,9 +272,11 @@ iwlwifi: pci:v00008086d000024F3sv*sd00009132bc*sc*i*
 iwlwifi: pci:v00008086d000024F3sv*sd00009150bc*sc*i*
 iwlwifi: pci:v00008086d000024F3sv*sd0000B0B0bc*sc*i*
 iwlwifi: pci:v00008086d000024F3sv*sd0000C010bc*sc*i*
+iwlwifi: pci:v00008086d000024F3sv*sd0000C030bc*sc*i*
 iwlwifi: pci:v00008086d000024F3sv*sd0000C050bc*sc*i*
 iwlwifi: pci:v00008086d000024F3sv*sd0000C110bc*sc*i*
 iwlwifi: pci:v00008086d000024F3sv*sd0000D010bc*sc*i*
+iwlwifi: pci:v00008086d000024F3sv*sd0000D030bc*sc*i*
 iwlwifi: pci:v00008086d000024F3sv*sd0000D050bc*sc*i*
 iwlwifi: pci:v00008086d000024F3sv*sd0000D0B0bc*sc*i*
 iwlwifi: pci:v00008086d000024F4sv*sd00000030bc*sc*i*
@@ -308,6 +310,8 @@ iwlwifi: pci:v00008086d000024FDsv*sd00001014bc*sc*i*
 iwlwifi: pci:v00008086d000024FDsv*sd000010D0bc*sc*i*
 iwlwifi: pci:v00008086d000024FDsv*sd00001110bc*sc*i*
 iwlwifi: pci:v00008086d000024FDsv*sd00001130bc*sc*i*
+iwlwifi: pci:v00008086d000024FDsv*sd00001431bc*sc*i*
+iwlwifi: pci:v00008086d000024FDsv*sd00001432bc*sc*i*
 iwlwifi: pci:v00008086d000024FDsv*sd00003E01bc*sc*i*
 iwlwifi: pci:v00008086d000024FDsv*sd00003E02bc*sc*i*
 iwlwifi: pci:v00008086d000024FDsv*sd00008010bc*sc*i*
@@ -441,6 +445,8 @@ iwlwifi: pci:v00008086d0000A840sv*sd00001671bc*sc*i*
 iwlwifi: pci:v00008086d0000A840sv*sd00001672bc*sc*i*
 iwlwifi: pci:v00008086d0000A840sv*sd00001771bc*sc*i*
 iwlwifi: pci:v00008086d0000A840sv*sd00001772bc*sc*i*
+iwlwifi: pci:v00008086d0000A840sv*sd00001775bc*sc*i*
+iwlwifi: pci:v00008086d0000A840sv*sd00001776bc*sc*i*
 iwlwifi: pci:v00008086d0000A840sv*sd00001791bc*sc*i*
 iwlwifi: pci:v00008086d0000A840sv*sd00001792bc*sc*i*
 iwlwifi: pci:v00008086d0000A840sv*sd00004090bc*sc*i*

git_id

@@ -1 +1 @@
-aaae2fb60f75b07d9c249ebe668524f7ddf51243
+0d92efb540f49e0aa254f0685b8a71b82608f5c1

kernel-firmware-iwlwifi.changes

@@ -1,3 +1,55 @@
+-------------------------------------------------------------------
+Sat Jun 21 08:04:10 UTC 2025 - Takashi Iwai <tiwai@suse.com>
+
+- Update aliases
+
+-------------------------------------------------------------------
+Tue Jun 10 07:14:16 UTC 2025 - Takashi Iwai <tiwai@suse.com>
+
+- Update to version 20250609 (git commit 0d92efb540f4):
+  * Revert "iwlwifi: add Bz/gl FW for core96-76 release"
+
+-------------------------------------------------------------------
+Thu Jun  5 10:38:22 UTC 2025 - Takashi Iwai <tiwai@suse.com>
+
+- Update to version 20250603 (git commit 3b75d677f898):
+  * iwlwifi: add Bz/gl FW for core96-76 release
+  * iwlwifi: update ty/So/Ma firmwares for core96-76 release
+  * iwlwifi: update cc/Qu/QuZ firmwares for core96-76 release
+  * iwlwifi: update firmwares for 8000 series
+  * iwlwifi: update 7265D firmware
+
+-------------------------------------------------------------------
+Fri Apr 25 13:52:22 UTC 2025 - Takashi Iwai <tiwai@suse.com>
+
+- Change conflicts filesystem < 84 to conflicts filesystem without
+  may-perform-usrmerge. Version 84 is specific to Tumbleweed; CODE
+  16 uses Version 16; yet we need to ensure we get an up-to-date
+  version of filesystem. Relying on the recently introduced provides
+  instructing zypp about the usrmerge is perfect for this use case.
+
+-------------------------------------------------------------------
+Thu Apr 24 06:17:11 UTC 2025 - Takashi Iwai <tiwai@suse.com>
+
+- Update to version 20250423 (git commit c67433231cbd):
+  * iwlwifi: add Bz/gl FW for core95-82 release
+  * iwlwifi: update ty/So/Ma firmwares for core95-82 release
+  * iwlwifi: update cc/Qu/QuZ firmwares for core95-82 release
+
+-------------------------------------------------------------------
+Wed Apr 23 13:35:06 UTC 2025 - Takashi Iwai <tiwai@suse.com>
+
+- Update to version 20250422 (git commit 32f3227b67c0):
+  * iwlwifi: add Bz-hr FW for core93-123 release
+
+-------------------------------------------------------------------
+Thu Mar 13 06:40:12 UTC 2025 - Takashi Iwai <tiwai@suse.com>
+
+- Update to version 20250312 (git commit 89ba9b7ce05c):
+  * iwlwifi: add Bz/gl FW for core94-91 release
+  * iwlwifi: update ty/So/Ma firmwares for core94-91 release
+  * iwlwifi: update cc/Qu/QuZ firmwares for core94-91 release
+
 -------------------------------------------------------------------
 Tue Feb 11 09:26:37 UTC 2025 - Takashi Iwai <tiwai@suse.com>
 
@@ -5218,7 +5270,6 @@ Wed Nov 24 20:02:38 UTC 2010 - coolo@novell.com
 - update to 20101113 tarball for 2.6.36+ kernel
 
 -------------------------------------------------------------------
-
 Thu Jul  1 17:11:34 UTC 2010 - gregkh@suse.de
 
 - update to the 20100617 tarball, which has lots of updates that

kernel-firmware-iwlwifi.spec

@@ -20,18 +20,17 @@
 %define _firmwaredir /lib/firmware
 %endif
 %define __ksyms_path ^%{_firmwaredir}
-%define git_version aaae2fb60f75b07d9c249ebe668524f7ddf51243
+%define git_version 0d92efb540f49e0aa254f0685b8a71b82608f5c1
 
 Name:           kernel-firmware-iwlwifi
-Version:        20250206
+Version:        20250609
 Release:        0
 Summary:        Kernel firmware files for Intel wireless drivers
-License:        SUSE-Firmware AND GPL-2.0-or-later
+License:        GPL-2.0-or-later AND SUSE-Firmware
 Group:          System/Kernel
 URL:            https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/
 Source0:        %{name}-%{version}.tar.xz
-# URL:          https://github.com/openSUSE/kernel-firmware-tools/
-Source1:        kernel-firmware-tools-20250211.tar.xz
+Source1:        https://github.com/openSUSE/kernel-firmware-tools/archive/refs/tags/20250605.tar.gz#/kernel-firmware-tools-20250605.tar.gz
 Source2:        %{name}-rpmlintrc
 Source3:        git_id
 Source10:       aliases
@@ -53,15 +52,14 @@ Source25:       topicprovs
 BuildRequires:  suse-module-tools
 Requires(post): %{_bindir}/mkdir
 Requires(post): %{_bindir}/touch
-Requires(postun):%{_bindir}/mkdir
-Requires(postun):%{_bindir}/touch
+Requires(postun): %{_bindir}/mkdir
+Requires(postun): %{_bindir}/touch
 Requires(post): dracut >= 049
 Conflicts:      kernel < 5.3
 Conflicts:      kernel-firmware-uncompressed
 BuildArch:      noarch
 %if 0%{?suse_version} >= 1550
-# make sure we have post-usrmerge filesystem package on TW
-Conflicts:      filesystem < 84
+Conflicts:      (filesystem without may-perform-usrmerge)
 %endif
 Provides:       iwl1000-ucode = %{version}
 Obsoletes:      iwl1000-ucode < %{version}
@@ -81,15 +79,7 @@ Provides:       iwl6050-ucode = %{version}
 Obsoletes:      iwl6050-ucode < %{version}
 Provides:       iwl6000g2-ucode = %{version}
 Obsoletes:      iwl6000g2-ucode < %{version}
-Supplements:    modalias(pci:v00008086d00004222sv*sd*bc*sc*i*)
-Supplements:    modalias(pci:v00008086d00004222sv*sd00001005bc*sc*i*)
-Supplements:    modalias(pci:v00008086d00004222sv*sd00001034bc*sc*i*)
-Supplements:    modalias(pci:v00008086d00004222sv*sd00001044bc*sc*i*)
-Supplements:    modalias(pci:v00008086d00004227sv*sd*bc*sc*i*)
-Supplements:    modalias(pci:v00008086d00004227sv*sd00001014bc*sc*i*)
 Supplements:    modalias(iwl4965)
-Supplements:    modalias(pci:v00008086d00004229sv*sd*bc*sc*i*)
-Supplements:    modalias(pci:v00008086d00004230sv*sd*bc*sc*i*)
 Supplements:    modalias(pci:v00008086d00000082sv*sd00001301bc*sc*i*)
 Supplements:    modalias(pci:v00008086d00000082sv*sd00001304bc*sc*i*)
 Supplements:    modalias(pci:v00008086d00000082sv*sd00001305bc*sc*i*)
@@ -355,9 +345,11 @@ Supplements:    modalias(pci:v00008086d000024F3sv*sd00009132bc*sc*i*)
 Supplements:    modalias(pci:v00008086d000024F3sv*sd00009150bc*sc*i*)
 Supplements:    modalias(pci:v00008086d000024F3sv*sd0000B0B0bc*sc*i*)
 Supplements:    modalias(pci:v00008086d000024F3sv*sd0000C010bc*sc*i*)
+Supplements:    modalias(pci:v00008086d000024F3sv*sd0000C030bc*sc*i*)
 Supplements:    modalias(pci:v00008086d000024F3sv*sd0000C050bc*sc*i*)
 Supplements:    modalias(pci:v00008086d000024F3sv*sd0000C110bc*sc*i*)
 Supplements:    modalias(pci:v00008086d000024F3sv*sd0000D010bc*sc*i*)
+Supplements:    modalias(pci:v00008086d000024F3sv*sd0000D030bc*sc*i*)
 Supplements:    modalias(pci:v00008086d000024F3sv*sd0000D050bc*sc*i*)
 Supplements:    modalias(pci:v00008086d000024F3sv*sd0000D0B0bc*sc*i*)
 Supplements:    modalias(pci:v00008086d000024F4sv*sd00000030bc*sc*i*)
@@ -391,6 +383,8 @@ Supplements:    modalias(pci:v00008086d000024FDsv*sd00001014bc*sc*i*)
 Supplements:    modalias(pci:v00008086d000024FDsv*sd000010D0bc*sc*i*)
 Supplements:    modalias(pci:v00008086d000024FDsv*sd00001110bc*sc*i*)
 Supplements:    modalias(pci:v00008086d000024FDsv*sd00001130bc*sc*i*)
+Supplements:    modalias(pci:v00008086d000024FDsv*sd00001431bc*sc*i*)
+Supplements:    modalias(pci:v00008086d000024FDsv*sd00001432bc*sc*i*)
 Supplements:    modalias(pci:v00008086d000024FDsv*sd00003E01bc*sc*i*)
 Supplements:    modalias(pci:v00008086d000024FDsv*sd00003E02bc*sc*i*)
 Supplements:    modalias(pci:v00008086d000024FDsv*sd00008010bc*sc*i*)
@@ -422,6 +416,13 @@ Supplements:    modalias(pci:v00008086d00003166sv*sd00004310bc*sc*i*)
 Supplements:    modalias(pci:v00008086d000031DCsv*sd*bc*sc*i*)
 Supplements:    modalias(pci:v00008086d000034F0sv*sd*bc*sc*i*)
 Supplements:    modalias(pci:v00008086d00003DF0sv*sd*bc*sc*i*)
+Supplements:    modalias(pci:v00008086d00004222sv*sd*bc*sc*i*)
+Supplements:    modalias(pci:v00008086d00004222sv*sd00001005bc*sc*i*)
+Supplements:    modalias(pci:v00008086d00004222sv*sd00001034bc*sc*i*)
+Supplements:    modalias(pci:v00008086d00004222sv*sd00001044bc*sc*i*)
+Supplements:    modalias(pci:v00008086d00004227sv*sd*bc*sc*i*)
+Supplements:    modalias(pci:v00008086d00004227sv*sd00001014bc*sc*i*)
+Supplements:    modalias(pci:v00008086d00004229sv*sd*bc*sc*i*)
 Supplements:    modalias(pci:v00008086d0000422Bsv*sd00001101bc*sc*i*)
 Supplements:    modalias(pci:v00008086d0000422Bsv*sd00001108bc*sc*i*)
 Supplements:    modalias(pci:v00008086d0000422Bsv*sd00001121bc*sc*i*)
@@ -431,6 +432,7 @@ Supplements:    modalias(pci:v00008086d0000422Csv*sd00001306bc*sc*i*)
 Supplements:    modalias(pci:v00008086d0000422Csv*sd00001307bc*sc*i*)
 Supplements:    modalias(pci:v00008086d0000422Csv*sd00001321bc*sc*i*)
 Supplements:    modalias(pci:v00008086d0000422Csv*sd00001326bc*sc*i*)
+Supplements:    modalias(pci:v00008086d00004230sv*sd*bc*sc*i*)
 Supplements:    modalias(pci:v00008086d00004232sv*sd00001201bc*sc*i*)
 Supplements:    modalias(pci:v00008086d00004232sv*sd00001204bc*sc*i*)
 Supplements:    modalias(pci:v00008086d00004232sv*sd00001205bc*sc*i*)
@@ -524,6 +526,8 @@ Supplements:    modalias(pci:v00008086d0000A840sv*sd00001671bc*sc*i*)
 Supplements:    modalias(pci:v00008086d0000A840sv*sd00001672bc*sc*i*)
 Supplements:    modalias(pci:v00008086d0000A840sv*sd00001771bc*sc*i*)
 Supplements:    modalias(pci:v00008086d0000A840sv*sd00001772bc*sc*i*)
+Supplements:    modalias(pci:v00008086d0000A840sv*sd00001775bc*sc*i*)
+Supplements:    modalias(pci:v00008086d0000A840sv*sd00001776bc*sc*i*)
 Supplements:    modalias(pci:v00008086d0000A840sv*sd00001791bc*sc*i*)
 Supplements:    modalias(pci:v00008086d0000A840sv*sd00001792bc*sc*i*)
 Supplements:    modalias(pci:v00008086d0000A840sv*sd00004090bc*sc*i*)
@@ -538,9 +542,9 @@ Supplements:    modalias(pci:v00008086d0000E440sv*sd*bc*sc*i*)
 %description
 This package contains kernel firmware files for Intel wireless drivers.
 
-
 %prep
-%autosetup -a1 -p1
+%autosetup -p1
+tar xf %{S:1} --strip-components=1
 # strip down WHENCE for the topic
 scripts/strip-topic-whence.sh iwlwifi < WHENCE > WHENCE.new
 mv WHENCE.new WHENCE