From 9dbf3cadd678782fc45a1c34e22236c1fb4468eb Mon Sep 17 00:00:00 2001
From: Funda Wang <fundawang@yeah.net>
Date: Mon, 11 Nov 2024 19:46:16 +0800
Subject: [PATCH] 20241110

(cherry picked from commit 5d904c725e6649abec7d6edc55b8e4df5447253c)
---
 ...-20241017.tar.xz => linux-firmware-20241110.tar.xz |  4 ++--
 linux-firmware.spec                                   | 11 +++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)
 rename linux-firmware-20241017.tar.xz => linux-firmware-20241110.tar.xz (32%)

diff --git a/linux-firmware-20241017.tar.xz b/linux-firmware-20241110.tar.xz
similarity index 32%
rename from linux-firmware-20241017.tar.xz
rename to linux-firmware-20241110.tar.xz
index 553b8e3..33179f8 100644
--- a/linux-firmware-20241017.tar.xz
+++ b/linux-firmware-20241110.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a26c38ef5a83272f2b98ce8bf8ca1865a852a3deea49ce5a8dd804b914351273
-size 397400292
+oid sha256:32e6d3eb5c7fcb69fe5d58976c6deafa0d6552719c6e74835064aff049d25bd7
+size 405593676
diff --git a/linux-firmware.spec b/linux-firmware.spec
index a4a920b..e676e2b 100644
--- a/linux-firmware.spec
+++ b/linux-firmware.spec
@@ -3,7 +3,7 @@
 %global _lib_path /usr/lib/firmware
 
 Name:		linux-firmware
-Version:	20241017
+Version:	20241110
 Release:	1
 Summary:	Firmware files used by the Linux kernel
 License:	GPL-1.0-or-later AND GPL-2.0-or-later AND MIT and Redistributable, no modification permitted
@@ -45,6 +45,8 @@ Provides:	libertas-usb8388-firmware = 2:%{version}-%{release}
 Provides:	libertas-usb8388-olpc-firmware = %{version}-%{release}
 Provides:	libertas-sd8686-firmware = %{version}-%{release}
 Provides:	libertas-sd8787-firmware = %{version}-%{release}
+# for liberas/sd8688.bin -> mrvl/sd8688.bin
+Requires:       %{name}-mrvl = %{version}-%{release}
 
 Obsoletes:      libertas-usb8388-firmware < 2:%{version}-%{release}
 Obsoletes:      libertas-sd8686-firmware < %{version}-%{release}
@@ -142,9 +144,7 @@ popd
 
 %install
 mkdir -p %{buildroot}/%{_lib_path}/updates
-cp -r * %{buildroot}/%{_lib_path}
-rm %{buildroot}/%{_lib_path}/{WHENCE,LICENCE.*,LICENSE.*}
-make COPYOPTS="-v --ignore-duplicates" DESTDIR=%{buildroot} FIRMWAREDIR=%{_lib_path} install
+make DESTDIR=%{buildroot} FIRMWAREDIR=%{_lib_path} install-zst
 
 pushd %{buildroot}/%{_lib_path}
 rm -f usbdux/*dux */*.asm
@@ -203,6 +203,9 @@ popd
 %{_lib_path}/ti-connectivity
 
 %changelog
+* Mon Nov 11 2024 Funda Wang <fundawang@yeah.net> - 20241110-1
+- update to 20241110
+
 * Fri Oct 18 2024 Funda Wang <fundawang@yeah.net> - 20241017-1
 - update to 20241017
 
-- 
Gitee