From 963f7fc6f5ff453bbe0e1ec64429eee9f8a10846 Mon Sep 17 00:00:00 2001 From: wangxiao65 Date: Fri, 30 Aug 2024 02:15:06 +0000 Subject: [PATCH] update to 20240811 --- .gitattributes | 2 +- change-python-script-shebang-to-python3.patch | 24 ------------------- ...7.tar.gz => linux-firmware-20240811.tar.gz | 4 ++-- linux-firmware.spec | 11 +++++---- 4 files changed, 10 insertions(+), 31 deletions(-) delete mode 100644 change-python-script-shebang-to-python3.patch rename linux-firmware-20211027.tar.gz => linux-firmware-20240811.tar.gz (32%) diff --git a/.gitattributes b/.gitattributes index fb8fa74..99a0449 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1 @@ -linux-firmware-20211027.tar.gz filter=lfs diff=lfs merge=lfs -text +linux-firmware-20240811.tar.gz filter=lfs diff=lfs merge=lfs -text diff --git a/change-python-script-shebang-to-python3.patch b/change-python-script-shebang-to-python3.patch deleted file mode 100644 index 42a3565..0000000 --- a/change-python-script-shebang-to-python3.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 1dfd5bcbe726900519ee832d784f1e8b749def22 Mon Sep 17 00:00:00 2001 -From: yuxiangyang -Date: Thu, 20 Feb 2020 22:43:37 -0500 -Subject: [PATCH] change firmware python script shebang to python3 - -Signed-off-by: yuxiangyang ---- - check_whence.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/check_whence.py b/check_whence.py -index 662c609..66a2774 100755 ---- a/check_whence.py -+++ b/check_whence.py -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python3 - - import os, re, sys - from io import open --- -1.8.3.1 - - diff --git a/linux-firmware-20211027.tar.gz b/linux-firmware-20240811.tar.gz similarity index 32% rename from linux-firmware-20211027.tar.gz rename to linux-firmware-20240811.tar.gz index db3fde7..05360a3 100644 --- a/linux-firmware-20211027.tar.gz +++ b/linux-firmware-20240811.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:630b9be1e6e53131b0d278441218b4646f439837dcc77a8f4b8cff533c9b82be -size 354952560 +oid sha256:639af65e08b45ef0adbee8a7b5a1b6afc030a05c019fd52f16d5673f5c0664bd +size 580546571 diff --git a/linux-firmware.spec b/linux-firmware.spec index d2dd0ce..ac80085 100644 --- a/linux-firmware.spec +++ b/linux-firmware.spec @@ -1,11 +1,11 @@ %define _binaries_in_noarch_packages_terminate_build 0 -%global release 3 +%global release 1 %global _lib_path /usr/lib/firmware %global _license_path /usr/share/licenses Name: linux-firmware -Version: 20211027 +Version: 20240811 Release: %{release} Summary: Firmware files used by the Linux kernel License: GPL+ and GPLv2+ and MIT and Redistributable, no modification permitted @@ -13,7 +13,6 @@ URL: http://www.kernel.org/ BuildArch: noarch Source0: https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/%{name}-%{version}.tar.gz -Patch1: change-python-script-shebang-to-python3.patch Provides: kernel-firmware = %{version} xorg-x11-drv-ati-firmware = 7.0 Obsoletes: kernel-firmware < %{version} xorg-x11-drv-ati-firmware < 6.13.0-0.22 @@ -130,7 +129,7 @@ mkdir -p %{buildroot}/%{_license_path} cp -r * %{buildroot}/%{_lib_path} cp -r WHENCE LICENCE.* %{buildroot}/%{_license_path} rm %{buildroot}/%{_lib_path}/{WHENCE,LICENCE.*,LICENSE.*} -make DESTDIR=%{buildroot} FIRMWAREDIR=%{_lib_path} install +make COPYOPTS="--ignore-duplicates" DESTDIR=%{buildroot} FIRMWAREDIR=%{_lib_path} install pushd %{buildroot}/%{_lib_path} rm -f usbdux/*dux */*.asm @@ -180,6 +179,10 @@ popd %changelog +* Fri Aug 30 2024 wangxiao - 20240811-1 +- update to 20240811 +- linux-firmware has changed python to python3, so remove this patch + * Wed Aug 7 2024 zhaoxiaohu - 20211027-3 - fix build install need use copy-firmware.sh ice Intel(R) E810 Series intel/ice/ddp/ice.pkg -> ice-1.3.26.0.pkg -- Gitee