Sync changes to SLFO-1.2 branch

aliases

@@ -1,12 +1,12 @@
 btmtksdio: sdio:c*v037Ad7663*
 btmtksdio: sdio:c*v037Ad7668*
 btmtksdio: sdio:c*v037Ad7961*
-btmtkuart: of:N*T*Cmediatek,mt7622-bluetooth
-btmtkuart: of:N*T*Cmediatek,mt7622-bluetoothC*
-btmtkuart: of:N*T*Cmediatek,mt7663u-bluetooth
-btmtkuart: of:N*T*Cmediatek,mt7663u-bluetoothC*
-btmtkuart: of:N*T*Cmediatek,mt7668u-bluetooth
-btmtkuart: of:N*T*Cmediatek,mt7668u-bluetoothC*
+btmtkuart: of:N*T*Cmediatek%2Cmt7622-bluetooth
+btmtkuart: of:N*T*Cmediatek%2Cmt7622-bluetoothC*
+btmtkuart: of:N*T*Cmediatek%2Cmt7663u-bluetooth
+btmtkuart: of:N*T*Cmediatek%2Cmt7663u-bluetoothC*
+btmtkuart: of:N*T*Cmediatek%2Cmt7668u-bluetooth
+btmtkuart: of:N*T*Cmediatek%2Cmt7668u-bluetoothC*
 mt7601u: usb:v0B05p17D3d*dc*dsc*dp*ic*isc*ip*in*
 mt7601u: usb:v0E8Dp760Ad*dc*dsc*dp*ic*isc*ip*in*
 mt7601u: usb:v0E8Dp760Bd*dc*dsc*dp*ic*isc*ip*in*
@@ -60,6 +60,8 @@ mt76x2e: pci:v000014C3d00007612sv*sd*bc*sc*i*
 mt76x2e: pci:v000014C3d00007662sv*sd*bc*sc*i*
 mt76x2u: usb:v045Ep02E6d*dc*dsc*dp*ic*isc*ip*in*
 mt76x2u: usb:v045Ep02FEd*dc*dsc*dp*ic*isc*ip*in*
+mt76x2u: usb:v0471p2126d*dc*dsc*dp*ic*isc*ip*in*
+mt76x2u: usb:v0471p7600d*dc*dsc*dp*ic*isc*ip*in*
 mt76x2u: usb:v057Cp8503d*dc*dsc*dp*ic*isc*ip*in*
 mt76x2u: usb:v0846p9014d*dc*dsc*dp*ic*isc*ip*in*
 mt76x2u: usb:v0846p9053d*dc*dsc*dp*ic*isc*ip*in*
@@ -68,6 +70,7 @@ mt76x2u: usb:v0B05p180Bd*dc*dsc*dp*ic*isc*ip*in*
 mt76x2u: usb:v0B05p1833d*dc*dsc*dp*ic*isc*ip*in*
 mt76x2u: usb:v0E8Dp7612d*dc*dsc*dp*ic*isc*ip*in*
 mt76x2u: usb:v0E8Dp7632d*dc*dsc*dp*ic*isc*ip*in*
+mt76x2u: usb:v2357p0137d*dc*dsc*dp*ic*isc*ip*in*
 mt76x2u: usb:v2C4Ep0103d*dc*dsc*dp*ic*isc*ip*in*
 mt76x2u: usb:v7392pB711d*dc*dsc*dp*ic*isc*ip*in*
 mt7921e: pci:v00000B48d00007922sv*sd*bc*sc*i*
@@ -87,18 +90,20 @@ mt7925u: usb:v0E8Dp7925d*dc*dsc*dp*icFFiscFFipFFin*
 mt7996e: pci:v000014C3d00007990sv*sd*bc*sc*i*
 mt7996e: pci:v000014C3d00007991sv*sd*bc*sc*i*
 mt7996e: pci:v000014C3d00007992sv*sd*bc*sc*i*
+mt7996e: pci:v000014C3d00007993sv*sd*bc*sc*i*
 mt7996e: pci:v000014C3d0000799Asv*sd*bc*sc*i*
-mtk_scp: of:N*T*Cmediatek,mt8183-scp
-mtk_scp: of:N*T*Cmediatek,mt8183-scpC*
-mtk_scp: of:N*T*Cmediatek,mt8186-scp
-mtk_scp: of:N*T*Cmediatek,mt8186-scpC*
-mtk_scp: of:N*T*Cmediatek,mt8188-scp
-mtk_scp: of:N*T*Cmediatek,mt8188-scp-dual
-mtk_scp: of:N*T*Cmediatek,mt8188-scp-dualC*
-mtk_scp: of:N*T*Cmediatek,mt8188-scpC*
-mtk_scp: of:N*T*Cmediatek,mt8192-scp
-mtk_scp: of:N*T*Cmediatek,mt8192-scpC*
-mtk_scp: of:N*T*Cmediatek,mt8195-scp
-mtk_scp: of:N*T*Cmediatek,mt8195-scp-dual
-mtk_scp: of:N*T*Cmediatek,mt8195-scp-dualC*
-mtk_scp: of:N*T*Cmediatek,mt8195-scpC*
+mt7996e: pci:v000014C3d0000799Bsv*sd*bc*sc*i*
+mtk_scp: of:N*T*Cmediatek%2Cmt8183-scp
+mtk_scp: of:N*T*Cmediatek%2Cmt8183-scpC*
+mtk_scp: of:N*T*Cmediatek%2Cmt8186-scp
+mtk_scp: of:N*T*Cmediatek%2Cmt8186-scpC*
+mtk_scp: of:N*T*Cmediatek%2Cmt8188-scp
+mtk_scp: of:N*T*Cmediatek%2Cmt8188-scp-dual
+mtk_scp: of:N*T*Cmediatek%2Cmt8188-scp-dualC*
+mtk_scp: of:N*T*Cmediatek%2Cmt8188-scpC*
+mtk_scp: of:N*T*Cmediatek%2Cmt8192-scp
+mtk_scp: of:N*T*Cmediatek%2Cmt8192-scpC*
+mtk_scp: of:N*T*Cmediatek%2Cmt8195-scp
+mtk_scp: of:N*T*Cmediatek%2Cmt8195-scp-dual
+mtk_scp: of:N*T*Cmediatek%2Cmt8195-scp-dualC*
+mtk_scp: of:N*T*Cmediatek%2Cmt8195-scpC*

git_id

@@ -1 +1 @@
-6cf959daab2a38d074b059f73c24aab9d4dbcbc3
+99d64b4f788c16e81b6550ef94f43c6b91cfad2d

kernel-firmware-mediatek-20250220.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cb92888fc2165393b7cf855f22b351031463e2fb892fcd3c022a24caa1d49e19
-size 19155164

kernel-firmware-mediatek.changes

@@ -1,3 +1,102 @@
+-------------------------------------------------------------------
+Thu Jul 10 16:43:38 UTC 2025 - Takashi Iwai <tiwai@suse.com>
+
+- Update to version 20250708 (git commit 99d64b4f788c):
+  * mediatek MT7921: update bluetooth firmware to 20250625154126
+
+-------------------------------------------------------------------
+Mon Jul  7 07:22:41 UTC 2025 - Takashi Iwai <tiwai@suse.com>
+
+- Update to version 20250707 (git commit ba5e4e381494):
+  * linux-firmware: update firmware for MT7921 WiFi device
+
+-------------------------------------------------------------------
+Sat Jun 21 08:04:12 UTC 2025 - Takashi Iwai <tiwai@suse.com>
+
+- Update aliases
+
+-------------------------------------------------------------------
+Fri Jun 20 08:39:57 UTC 2025 - Takashi Iwai <tiwai@suse.com>
+
+- Update to version 20250619 (git commit dcd2ee2f57a7):
+  * mediatek: Update mt8186 SCP firmware
+
+-------------------------------------------------------------------
+Sun Jun 15 09:08:48 UTC 2025 - Takashi Iwai <tiwai@suse.com>
+
+- Update to version 20250613 (git commit 12fe085fa409):
+  * linux-firmware: update firmware for MT7986
+  * linux-firmware: update firmware for MT7981
+  * linux-firmware: update firmware for MT7916
+
+-------------------------------------------------------------------
+Sat Jun  7 13:23:15 UTC 2025 - Takashi Iwai <tiwai@suse.com>
+
+- Update to version 20250606 (git commit 4f0106cf1943):
+  * mediatek MT7922: update bluetooth firmware to 20250523103438
+  * mediatek MT7921: update bluetooth firmware to 20250523111333
+  * linux-firmware: update firmware for MT7922 WiFi device
+  * linux-firmware: update firmware for MT7921 WiFi device
+
+-------------------------------------------------------------------
+Thu Jun  5 10:38:57 UTC 2025 - Takashi Iwai <tiwai@suse.com>
+
+- Update to version 20250603 (git commit 3b75d677f898):
+  * mediatek MT7925: update bluetooth firmware to 20250526153203
+  * linux-firmware: update firmware for MT7925 WiFi device
+
+-------------------------------------------------------------------
+Tue May 20 14:24:43 UTC 2025 - Takashi Iwai <tiwai@suse.com>
+
+- Update to version 20250520 (git commit 341b9e805613):
+  * mediatek: Add mt8196 VCP firmware
+
+-------------------------------------------------------------------
+Sat May  3 16:05:51 UTC 2025 - Takashi Iwai <tiwai@suse.com>
+
+- Update to version 20250502 (git commit 43dfb5fb64bb):
+  * linux-firmware: update firmware for MT7925 WiFi device
+  * mediatek MT7925: update bluetooth firmware to 20250425073330
+
+-------------------------------------------------------------------
+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:11:54 UTC 2025 - Takashi Iwai <tiwai@suse.com>
+
+- Update aliases from 6.15-rc1
+
+-------------------------------------------------------------------
+Tue Mar 25 07:22:30 UTC 2025 - Takashi Iwai <tiwai@suse.com>
+
+- Fix a typo in download URL
+
+-------------------------------------------------------------------
+Sat Mar 22 08:49:38 UTC 2025 - Takashi Iwai <tiwai@suse.com>
+
+- Correct aliases with comma (bsc#1239877)
+- Update spec to make kernel-firmware-tools downloadable
+
+-------------------------------------------------------------------
+Thu Mar 20 08:12:23 UTC 2025 - Takashi Iwai <tiwai@suse.com>
+
+- Update to version 20250319 (git commit b8828772e413):
+  * mediatek: Add MT8188 SCP firmware
+
+-------------------------------------------------------------------
+Tue Mar 11 06:35:08 UTC 2025 - Takashi Iwai <tiwai@suse.com>
+
+- Update to version 20250310 (git commit 11c4e60f9573):
+  * linux-firmware: update firmware for MT7925 WiFi device
+  * mediatek MT7925: update bluetooth firmware to 20250305133215
+  * mediatek MT7920: update bluetooth firmware to 20250210151502
+
 -------------------------------------------------------------------
 Fri Feb 21 10:40:41 UTC 2025 - Takashi Iwai <tiwai@suse.com>
 
@@ -5223,7 +5322,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-mediatek.spec

@@ -20,18 +20,17 @@
 %define _firmwaredir /lib/firmware
 %endif
 %define __ksyms_path ^%{_firmwaredir}
-%define git_version 6cf959daab2a38d074b059f73c24aab9d4dbcbc3
+%define git_version 99d64b4f788c16e81b6550ef94f43c6b91cfad2d
 
 Name:           kernel-firmware-mediatek
-Version:        20250220
+Version:        20250708
 Release:        0
 Summary:        Kernel firmware files for Mediatek network drivers
 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-20250218.tar.xz
+Source1:        https://github.com/openSUSE/kernel-firmware-tools/archive/refs/tags/20250710.tar.gz#/kernel-firmware-tools-20250710.tar.gz
 Source2:        %{name}-rpmlintrc
 Source3:        git_id
 Source10:       aliases
@@ -46,31 +45,30 @@ 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:       ralink-firmware = %{version}
 Obsoletes:      ralink-firmware < %{version}
-Supplements:    modalias(of:N*T*Cmediatek,mt7622-bluetooth)
-Supplements:    modalias(of:N*T*Cmediatek,mt7622-bluetoothC*)
-Supplements:    modalias(of:N*T*Cmediatek,mt7663u-bluetooth)
-Supplements:    modalias(of:N*T*Cmediatek,mt7663u-bluetoothC*)
-Supplements:    modalias(of:N*T*Cmediatek,mt7668u-bluetooth)
-Supplements:    modalias(of:N*T*Cmediatek,mt7668u-bluetoothC*)
-Supplements:    modalias(of:N*T*Cmediatek,mt8183-scp)
-Supplements:    modalias(of:N*T*Cmediatek,mt8183-scpC*)
-Supplements:    modalias(of:N*T*Cmediatek,mt8186-scp)
-Supplements:    modalias(of:N*T*Cmediatek,mt8186-scpC*)
-Supplements:    modalias(of:N*T*Cmediatek,mt8188-scp)
-Supplements:    modalias(of:N*T*Cmediatek,mt8188-scp-dual)
-Supplements:    modalias(of:N*T*Cmediatek,mt8188-scp-dualC*)
-Supplements:    modalias(of:N*T*Cmediatek,mt8188-scpC*)
-Supplements:    modalias(of:N*T*Cmediatek,mt8192-scp)
-Supplements:    modalias(of:N*T*Cmediatek,mt8192-scpC*)
-Supplements:    modalias(of:N*T*Cmediatek,mt8195-scp)
-Supplements:    modalias(of:N*T*Cmediatek,mt8195-scp-dual)
-Supplements:    modalias(of:N*T*Cmediatek,mt8195-scp-dualC*)
-Supplements:    modalias(of:N*T*Cmediatek,mt8195-scpC*)
+Supplements:    modalias(of:N*T*Cmediatek%2Cmt7622-bluetooth)
+Supplements:    modalias(of:N*T*Cmediatek%2Cmt7622-bluetoothC*)
+Supplements:    modalias(of:N*T*Cmediatek%2Cmt7663u-bluetooth)
+Supplements:    modalias(of:N*T*Cmediatek%2Cmt7663u-bluetoothC*)
+Supplements:    modalias(of:N*T*Cmediatek%2Cmt7668u-bluetooth)
+Supplements:    modalias(of:N*T*Cmediatek%2Cmt7668u-bluetoothC*)
+Supplements:    modalias(of:N*T*Cmediatek%2Cmt8183-scp)
+Supplements:    modalias(of:N*T*Cmediatek%2Cmt8183-scpC*)
+Supplements:    modalias(of:N*T*Cmediatek%2Cmt8186-scp)
+Supplements:    modalias(of:N*T*Cmediatek%2Cmt8186-scpC*)
+Supplements:    modalias(of:N*T*Cmediatek%2Cmt8188-scp)
+Supplements:    modalias(of:N*T*Cmediatek%2Cmt8188-scp-dual)
+Supplements:    modalias(of:N*T*Cmediatek%2Cmt8188-scp-dualC*)
+Supplements:    modalias(of:N*T*Cmediatek%2Cmt8188-scpC*)
+Supplements:    modalias(of:N*T*Cmediatek%2Cmt8192-scp)
+Supplements:    modalias(of:N*T*Cmediatek%2Cmt8192-scpC*)
+Supplements:    modalias(of:N*T*Cmediatek%2Cmt8195-scp)
+Supplements:    modalias(of:N*T*Cmediatek%2Cmt8195-scp-dual)
+Supplements:    modalias(of:N*T*Cmediatek%2Cmt8195-scp-dualC*)
+Supplements:    modalias(of:N*T*Cmediatek%2Cmt8195-scpC*)
 Supplements:    modalias(pci:v00000B48d00007922sv*sd*bc*sc*i*)
 Supplements:    modalias(pci:v000014C3d00000608sv*sd*bc*sc*i*)
 Supplements:    modalias(pci:v000014C3d00000616sv*sd*bc*sc*i*)
@@ -91,13 +89,17 @@ Supplements:    modalias(pci:v000014C3d00007961sv*sd*bc*sc*i*)
 Supplements:    modalias(pci:v000014C3d00007990sv*sd*bc*sc*i*)
 Supplements:    modalias(pci:v000014C3d00007991sv*sd*bc*sc*i*)
 Supplements:    modalias(pci:v000014C3d00007992sv*sd*bc*sc*i*)
+Supplements:    modalias(pci:v000014C3d00007993sv*sd*bc*sc*i*)
 Supplements:    modalias(pci:v000014C3d0000799Asv*sd*bc*sc*i*)
+Supplements:    modalias(pci:v000014C3d0000799Bsv*sd*bc*sc*i*)
 Supplements:    modalias(sdio:c*v037Ad7663*)
 Supplements:    modalias(sdio:c*v037Ad7668*)
 Supplements:    modalias(sdio:c*v037Ad7901*)
 Supplements:    modalias(sdio:c*v037Ad7961*)
 Supplements:    modalias(usb:v045Ep02E6d*dc*dsc*dp*ic*isc*ip*in*)
 Supplements:    modalias(usb:v045Ep02FEd*dc*dsc*dp*ic*isc*ip*in*)
+Supplements:    modalias(usb:v0471p2126d*dc*dsc*dp*ic*isc*ip*in*)
+Supplements:    modalias(usb:v0471p7600d*dc*dsc*dp*ic*isc*ip*in*)
 Supplements:    modalias(usb:v04BBp0951d*dc*dsc*dp*ic*isc*ip*in*)
 Supplements:    modalias(usb:v057Cp8502d*dc*dsc*dp*ic*isc*ip*in*)
 Supplements:    modalias(usb:v057Cp8503d*dc*dsc*dp*ic*isc*ip*in*)
@@ -140,6 +142,7 @@ Supplements:    modalias(usb:v20F4p806Bd*dc*dsc*dp*ic*isc*ip*in*)
 Supplements:    modalias(usb:v2357p0105d*dc*dsc*dp*ic*isc*ip*in*)
 Supplements:    modalias(usb:v2357p010Bd*dc*dsc*dp*ic*isc*ip*in*)
 Supplements:    modalias(usb:v2357p0123d*dc*dsc*dp*ic*isc*ip*in*)
+Supplements:    modalias(usb:v2357p0137d*dc*dsc*dp*ic*isc*ip*in*)
 Supplements:    modalias(usb:v2717p4106d*dc*dsc*dp*ic*isc*ip*in*)
 Supplements:    modalias(usb:v293Cp5702d*dc*dsc*dp*ic*isc*ip*in*)
 Supplements:    modalias(usb:v2955p0001d*dc*dsc*dp*ic*isc*ip*in*)
@@ -158,7 +161,8 @@ Supplements:    modalias(usb:v7392pC711d*dc*dsc*dp*ic*isc*ip*in*)
 This package contains kernel firmware files for Mediatek 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 mediatek < WHENCE > WHENCE.new
 mv WHENCE.new WHENCE