From ba794f5ce73bfd1d7db4a41915add32e0d041fa2e2d9a027f2725eae21a88473 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Wed, 9 Apr 2025 12:00:24 +0200
Subject: [PATCH] Update to version 20250408 (git commit c1a774f36657)

* Mellanox: Add new mlxsw_spectrum firmware xx.2014.4012
---
 git_id                                   |  2 +-
 kernel-firmware-mellanox-20250206.tar.xz |  3 ---
 kernel-firmware-mellanox-20250408.tar.xz |  3 +++
 kernel-firmware-mellanox.changes         |  6 ++++++
 kernel-firmware-mellanox.spec            | 17 ++++++++---------
 kernel-firmware-tools-20250211.tar.xz    |  3 ---
 kernel-firmware-tools-20250409.tar.gz    |  3 +++
 7 files changed, 21 insertions(+), 16 deletions(-)
 delete mode 100644 kernel-firmware-mellanox-20250206.tar.xz
 create mode 100644 kernel-firmware-mellanox-20250408.tar.xz
 delete mode 100644 kernel-firmware-tools-20250211.tar.xz
 create mode 100644 kernel-firmware-tools-20250409.tar.gz

diff --git a/git_id b/git_id
index 6510877..cb5516b 100644
--- a/git_id
+++ b/git_id
@@ -1 +1 @@
-aaae2fb60f75b07d9c249ebe668524f7ddf51243
+c1a774f36657e30e28a83002a8ebf5add44e02aa
diff --git a/kernel-firmware-mellanox-20250206.tar.xz b/kernel-firmware-mellanox-20250206.tar.xz
deleted file mode 100644
index 50af2f7..0000000
--- a/kernel-firmware-mellanox-20250206.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:94eb7a26fd216368a4c05b5819233deadf6b2d3523f7c3f6fc5c5b30cd035985
-size 80956776
diff --git a/kernel-firmware-mellanox-20250408.tar.xz b/kernel-firmware-mellanox-20250408.tar.xz
new file mode 100644
index 0000000..3b31469
--- /dev/null
+++ b/kernel-firmware-mellanox-20250408.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8b2f222bc7fec5399a48a94ace19e4f48d332cea3276d185cde0b25a532b420c
+size 94027692
diff --git a/kernel-firmware-mellanox.changes b/kernel-firmware-mellanox.changes
index 788cfd7..4e55c97 100644
--- a/kernel-firmware-mellanox.changes
+++ b/kernel-firmware-mellanox.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Apr  9 09:59:49 UTC 2025 - Takashi Iwai <tiwai@suse.com>
+
+- Update to version 20250408 (git commit c1a774f36657):
+  * Mellanox: Add new mlxsw_spectrum firmware xx.2014.4012
+
 -------------------------------------------------------------------
 Tue Feb 11 09:26:37 UTC 2025 - Takashi Iwai <tiwai@suse.com>
 
diff --git a/kernel-firmware-mellanox.spec b/kernel-firmware-mellanox.spec
index d537649..b188258 100644
--- a/kernel-firmware-mellanox.spec
+++ b/kernel-firmware-mellanox.spec
@@ -20,26 +20,25 @@
 %define _firmwaredir /lib/firmware
 %endif
 %define __ksyms_path ^%{_firmwaredir}
-%define git_version aaae2fb60f75b07d9c249ebe668524f7ddf51243
+%define git_version c1a774f36657e30e28a83002a8ebf5add44e02aa
 
 Name:           kernel-firmware-mellanox
-Version:        20250206
+Version:        20250408
 Release:        0
 Summary:        Kernel firmware files for Mellanox Spectrum switch driver
-License:        SUSE-Firmware AND GPL-2.0-or-later AND GPL-2.0-only
+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-20250211.tar.xz
+Source1:        https://github.com/openSUSE/kernel-firmware-tools/archive/refs/tags/20250409.tar.gz#/kernel-firmware-tools-20250409.tar.gz
 Source2:        %{name}-rpmlintrc
 Source3:        git_id
 Source10:       aliases
 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
@@ -56,9 +55,9 @@ Supplements:    modalias(pci:v000015B3d0000CF80sv*sd*bc*sc*i*)
 %description
 This package contains kernel firmware files for Mellanox Spectrum switch driver.
 
-
 %prep
-%autosetup -a1 -p1
+%autosetup -p1
+tar xf %{S:1} --strip-components=1
 # strip down WHENCE for the topic
 scripts/strip-topic-whence.sh mellanox < WHENCE > WHENCE.new
 mv WHENCE.new WHENCE
diff --git a/kernel-firmware-tools-20250211.tar.xz b/kernel-firmware-tools-20250211.tar.xz
deleted file mode 100644
index 036a78f..0000000
--- a/kernel-firmware-tools-20250211.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a1553e6b4c9ab0cacf4c5b632d74a16b6cee2dd69a370cfc57685221a705600d
-size 14424
diff --git a/kernel-firmware-tools-20250409.tar.gz b/kernel-firmware-tools-20250409.tar.gz
new file mode 100644
index 0000000..34a0a63
--- /dev/null
+++ b/kernel-firmware-tools-20250409.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:42aaef90118012b6cb7856be6726379d47c7a0c2477b180ad3d1f49b794ea7c6
+size 16821
-- 
2.49.0