Sync changes to SLFO-1.2 branch

OBS-URL: https://build.opensuse.org/request/show/1247384
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kernel-firmware-network?expand=0&rev=2

aliases

@@ -6,6 +6,7 @@ acenic: pci:v000012AEd00000002sv*sd*bc02sc00i*
 acenic: pci:v000012AEd000000FAsv*sd*bc02sc00i*
 acenic: pci:v00001385d0000620Asv*sd*bc02sc00i*
 acenic: pci:v00001385d0000630Asv*sd*bc02sc00i*
+as21xxx: mdio:0111010100000000100101??????????
 e100: pci:v00008086d00001029sv*sd*bc02sc00i*
 e100: pci:v00008086d00001030sv*sd*bc02sc00i*
 e100: pci:v00008086d00001031sv*sd*bc02sc00i*

git_id

@@ -1 +1 @@
-5faab136de1a0f70f9bdcb3d9e29e7261aeeb9b4
+6fc20e018cca0ab954fe249afb60ac5af69f102a

kernel-firmware-network.changes

@@ -1,3 +1,43 @@
+-------------------------------------------------------------------
+Fri Jul 18 14:39:13 UTC 2025 - Takashi Iwai <tiwai@suse.com>
+
+- Update to version 20250717 (git commit 6fc20e018cca):
+  * WHENCE: extract more license statements
+
+-------------------------------------------------------------------
+Mon Jun 30 06:07:37 UTC 2025 - Takashi Iwai <tiwai@suse.com>
+
+- Update to version 20250627 (git commit f40eafe21683):
+  * WHENCE: extract license texts
+
+-------------------------------------------------------------------
+Sat Jun 21 08:04:13 UTC 2025 - Takashi Iwai <tiwai@suse.com>
+
+- Update aliases
+
+-------------------------------------------------------------------
+Thu Jun  5 10:39:10 UTC 2025 - Takashi Iwai <tiwai@suse.com>
+
+- Update to version 20250603 (git commit 3b75d677f898):
+  * ice: update wireless_edge package to 1.3.23.0
+  * ice: update comms package to 1.3.55.0
+  * ice: update package to 1.3.43.0
+
+-------------------------------------------------------------------
+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.
+
+-------------------------------------------------------------------
+Wed Apr  9 10:00:31 UTC 2025 - Takashi Iwai <tiwai@suse.com>
+
+- Update to version 20250408 (git commit c1a774f36657):
+  * linux-firmware: add firmware for Aeonsemi AS21x1x 1G/2.5G/5G/10G Ethernet Phy
+
 -------------------------------------------------------------------
 Thu Feb 20 11:26:09 UTC 2025 - Takashi Iwai <tiwai@suse.com>
 
@@ -5222,7 +5262,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-network.spec

@@ -20,18 +20,17 @@
 %define _firmwaredir /lib/firmware
 %endif
 %define __ksyms_path ^%{_firmwaredir}
-%define git_version 5faab136de1a0f70f9bdcb3d9e29e7261aeeb9b4
+%define git_version 6fc20e018cca0ab954fe249afb60ac5af69f102a
 
 Name:           kernel-firmware-network
-Version:        20250219
+Version:        20250717
 Release:        0
 Summary:        Kernel firmware files for various network drivers
-License:        GPL-2.0-only AND GPL-2.0-or-later AND SUSE-Firmware
+License:        GPL-2.0-or-later AND SUSE-Firmware AND GPL-2.0-only
 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-20250218.tar.xz
+Source1:        https://github.com/openSUSE/kernel-firmware-tools/archive/refs/tags/20250718.tar.gz#/kernel-firmware-tools-20250718.tar.gz
 Source2:        %{name}-rpmlintrc
 Source3:        git_id
 Source10:       aliases
@@ -45,10 +44,10 @@ 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
 Supplements:    modalias(auxiliary:ice.sf)
+Supplements:    modalias(mdio:0111010100000000100101??????????)
 Supplements:    modalias(pci:v00001011d0000001Asv*sd*bc02sc00i*)
 Supplements:    modalias(pci:v0000106Bd00001645sv*sd*bc*sc*i*)
 Supplements:    modalias(pci:v00001077d00008020sv*sd*bc02sc00i00*)
@@ -277,7 +276,8 @@ Supplements:    modalias(pci:v00009004d00006915sv*sd*bc*sc*i*)
 This package contains kernel firmware files for various network 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 network < WHENCE > WHENCE.new
 mv WHENCE.new WHENCE