From ce1ec606e7e8687d820cdaafb3f06973f263b8e7 Mon Sep 17 00:00:00 2001 From: yangcheng1203 Date: Tue, 27 May 2025 10:23:08 +0800 Subject: [PATCH] update to 20250311 --- ...round-absense-of-rdfind-during-build.patch | 43 ------------------- download | 2 +- linux-firmware.spec | 21 ++++++++- 3 files changed, 20 insertions(+), 46 deletions(-) delete mode 100644 0001-Work-around-absense-of-rdfind-during-build.patch diff --git a/0001-Work-around-absense-of-rdfind-during-build.patch b/0001-Work-around-absense-of-rdfind-during-build.patch deleted file mode 100644 index b059e81..0000000 --- a/0001-Work-around-absense-of-rdfind-during-build.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 7d6fd433a494d923a4d299a31da9ccee8470d26a Mon Sep 17 00:00:00 2001 -From: rpm-build -Date: Fri, 15 Mar 2024 08:31:08 +0800 -Subject: [PATCH] Work around absense of rdfind during build - ---- - copy-firmware.sh | 13 ------------- - 1 file changed, 13 deletions(-) - -diff --git a/copy-firmware.sh b/copy-firmware.sh -index f9b1f0f..de28e88 100755 ---- a/copy-firmware.sh -+++ b/copy-firmware.sh -@@ -69,11 +69,6 @@ if [ -z "$destdir" ]; then - exit 1 - fi - --if ! which rdfind 2>/dev/null >/dev/null; then -- echo "ERROR: rdfind is not installed" -- exit 1 --fi -- - # shellcheck disable=SC2162 # file/folder name can include escaped symbols - grep -E '^(RawFile|File):' WHENCE | sed -E -e 's/^(RawFile|File): */\1 /;s/"//g' | while read k f; do - test -f "$f" || continue -@@ -87,14 +82,6 @@ grep -E '^(RawFile|File):' WHENCE | sed -E -e 's/^(RawFile|File): */\1 /;s/"//g' - fi - done - --$verbose "Finding duplicate files" --rdfind -makesymlinks true -makeresultsfile false "$destdir" >/dev/null --find "$destdir" -type l | while read -r l; do -- target="$(realpath "$l")" -- $verbose "Correcting path for $l" -- ln -fs "$(realpath --relative-to="$(dirname "$(realpath -s "$l")")" "$target")" "$l" --done -- - # shellcheck disable=SC2162 # file/folder name can include escaped symbols - grep -E '^Link:' WHENCE | sed -e 's/^Link: *//g;s/-> //g' | while read f d; do - if test -L "$f$compext"; then --- -2.31.1 - diff --git a/download b/download index 12eaff9..f5c9b77 100644 --- a/download +++ b/download @@ -1 +1 @@ -4e1b62642d8882781d66847133d2f0f0 linux-firmware-20231111.tar.gz +83d8b0ca78b5da2f4c496e8f6fc5343a linux-firmware-20250311.tar.gz diff --git a/linux-firmware.spec b/linux-firmware.spec index 0b9269f..da6038b 100644 --- a/linux-firmware.spec +++ b/linux-firmware.spec @@ -3,7 +3,7 @@ %define _binaries_in_noarch_packages_terminate_build 0 Name: linux-firmware -Version: 20231111 +Version: 20250311 Release: %{anolis_release}%{?dist} Summary: Firmware files used by the Linux kernel License: GPL+ and GPLv2+ and MIT and Redistributable, no modification permitted @@ -11,7 +11,6 @@ URL: http://www.kernel.org/ BuildArch: noarch Source0: https://www.kernel.org/pub/linux/kernel/firmware/%{name}-%{version}.tar.gz -Patch0: 0001-Work-around-absense-of-rdfind-during-build.patch BuildRequires: make BuildRequires: git-core @@ -19,6 +18,8 @@ BuildRequires: git-core Requires: linux-firmware-whence Provides: kernel-firmware = %{version} Obsoletes: kernel-firmware < %{version} +Obsoletes: cirrus-audio-firmware < %{version} +Obsoletes: intel-audio-firmware < %{version} Conflicts: microcode_ctl < 2.1-0 Recommends: amd-gpu-firmware @@ -34,6 +35,13 @@ Requires: realtek-firmware This package includes firmware files required for some devices to operate. +%package doc +Summary: Documentation files for %{name} +Requires: %{name} = %{version}-%{release} +BuildArch: noarch +%description doc +The %{name}-doc package contains documentation files for %{name}. + %package whence Summary: WHENCE License file License: GPL+ and GPLv2+ and MIT and Redistributable, no modification permitted @@ -335,6 +343,7 @@ sed -e 's/^/%%dir /' linux-firmware.dirs >> linux-firmware.files %files -n amd-gpu-firmware %license LICENSE.radeon LICENSE.amdgpu %{_prefix_firmware}/amdgpu/ +%{_prefix_firmware}/amdnpu/ %{_prefix_firmware}/radeon/ %files -n intel-gpu-firmware @@ -411,6 +420,7 @@ sed -e 's/^/%%dir /' linux-firmware.dirs >> linux-firmware.files %{_prefix_firmware}/iwlwifi-Qu*.ucode* %{_prefix_firmware}/iwlwifi-ty-a0* %{_prefix_firmware}/iwlwifi-so-a0* +%{_prefix_firmware}/iwlwifi-bz-b0* %files -n libertas-firmware %license LICENCE.Marvell @@ -477,7 +487,14 @@ sed -e 's/^/%%dir /' linux-firmware.dirs >> linux-firmware.files %{_prefix_firmware}/tdmb* %{_prefix_firmware}/v4l-cx2* +%files doc +%doc README.md + %changelog +* Tue May 27 2025 Cheng Yang - 20250311-1 +- update to 20250311 +- The patch was removed because the new version already included the patch content + * Fri Mar 15 2024 Kaiqiang Wang - 20231111-1 - update to 20231111 -- Gitee