Sync changes to SLFO-1.2 branch

git_id

@@ -1 +1 @@
-aaae2fb60f75b07d9c249ebe668524f7ddf51243
+99d64b4f788c16e81b6550ef94f43c6b91cfad2d

ucode-amd.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Thu Jul 10 16:45:03 UTC 2025 - Takashi Iwai <tiwai@suse.com>
+
+- Update to version 20250708 (git commit 99d64b4f788c):
+  * linux-firmware: Update AMD cpu microcode
+
+-------------------------------------------------------------------
+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.
+
 -------------------------------------------------------------------
 Tue Feb 11 09:26:37 UTC 2025 - Takashi Iwai <tiwai@suse.com>
 
@@ -5216,7 +5231,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

ucode-amd.spec

@@ -20,18 +20,17 @@
 %define _firmwaredir /lib/firmware
 %endif
 %define __ksyms_path ^%{_firmwaredir}
-%define git_version aaae2fb60f75b07d9c249ebe668524f7ddf51243
+%define git_version 99d64b4f788c16e81b6550ef94f43c6b91cfad2d
 
 Name:           ucode-amd
-Version:        20250206
+Version:        20250708
 Release:        0
 Summary:        Kernel firmware files for Microcode updates for AMD CPUs
-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/20250710.tar.gz#/kernel-firmware-tools-20250710.tar.gz
 Source2:        %{name}-rpmlintrc
 Source3:        git_id
 Source10:       topicprovs
@@ -45,8 +44,7 @@ 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
 # new style (after 3.12 kernel somewhen)
 Supplements:    modalias(cpu:type%%3Ax86*ven0002*)
@@ -56,9 +54,9 @@ Supplements:    modalias(x86cpu:vendor%%3A0002%%3Afamily%%3A*%%3Amodel%%3A*%%3Af
 %description
 This package contains kernel firmware files for Microcode updates for AMD CPUs.
 
-
 %prep
-%autosetup -a1 -p1
+%autosetup -p1
+tar xf %{S:1} --strip-components=1
 # strip down WHENCE for the topic
 scripts/strip-topic-whence.sh ucode-amd < WHENCE > WHENCE.new
 mv WHENCE.new WHENCE