From ef4f30b2e4b84e2a1acc5bfa18075286c52da96f Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Tue, 22 Oct 2024 15:31:08 +0800 Subject: [PATCH] 20241017 --- .gitattributes | 2 + ...1.tar.gz => linux-firmware-20241017.tar.xz | 4 +- linux-firmware.spec | 122 +++++++++++------- 3 files changed, 78 insertions(+), 50 deletions(-) rename linux-firmware-20240811.tar.gz => linux-firmware-20241017.tar.xz (32%) diff --git a/.gitattributes b/.gitattributes index 99a0449..b885afd 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,3 @@ linux-firmware-20240811.tar.gz filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text diff --git a/linux-firmware-20240811.tar.gz b/linux-firmware-20241017.tar.xz similarity index 32% rename from linux-firmware-20240811.tar.gz rename to linux-firmware-20241017.tar.xz index 05360a3..553b8e3 100644 --- a/linux-firmware-20240811.tar.gz +++ b/linux-firmware-20241017.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:639af65e08b45ef0adbee8a7b5a1b6afc030a05c019fd52f16d5673f5c0664bd -size 580546571 +oid sha256:a26c38ef5a83272f2b98ce8bf8ca1865a852a3deea49ce5a8dd804b914351273 +size 397400292 diff --git a/linux-firmware.spec b/linux-firmware.spec index b537550..27905f1 100644 --- a/linux-firmware.spec +++ b/linux-firmware.spec @@ -1,18 +1,16 @@ %define _binaries_in_noarch_packages_terminate_build 0 -%global release 2 %global _lib_path /usr/lib/firmware -%global _license_path /usr/share/licenses Name: linux-firmware -Version: 20240811 -Release: %{release} +Version: 20241017 +Release: 1 Summary: Firmware files used by the Linux kernel -License: GPL+ and GPLv2+ and MIT and Redistributable, no modification permitted -URL: http://www.kernel.org/ +License: GPL-1.0-or-later AND GPL-2.0-or-later AND MIT and Redistributable, no modification permitted +URL: https://www.kernel.org/ BuildArch: noarch -Source0: https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/%{name}-%{version}.tar.gz +Source0: https://www.kernel.org/pub/linux/kernel/firmware/%{name}-%{version}.tar.xz 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 @@ -27,6 +25,8 @@ Obsoletes: rt61pci-firmware < 1.2-11 Obsoletes: rt73usb-firmware < 1.8-11 Obsoletes: cx18-firmware < 20080628-10 Conflicts: microcode_ctl < 2.1-0 +BuildRequires: git +BuildRequires: python3 %description This package contains firmware images required by some devices. @@ -34,6 +34,7 @@ This package contains firmware images required by some devices. %package ath Summary: Firmware files used by the ath +Conflicts: linux-firmware < 20240909 %description ath This package contains firmware images required by some devices. @@ -45,9 +46,9 @@ Provides: libertas-usb8388-olpc-firmware = %{version}-%{release} Provides: libertas-sd8686-firmware = %{version}-%{release} Provides: libertas-sd8787-firmware = %{version}-%{release} -Obsoletes: libertas-usb8388-firmware -Obsoletes: libertas-sd8686-firmware -Obsoletes: libertas-sd8787-firmware +Obsoletes: libertas-usb8388-firmware < 2:%{version}-%{release} +Obsoletes: libertas-sd8686-firmware < %{version}-%{release} +Obsoletes: libertas-sd8787-firmware < %{version}-%{release} %description libertas This package contains firmware images required by some devices. @@ -85,51 +86,65 @@ This package contains firmware images required by some devices. %package iwlwifi Summary: Firmware files used by the iwlwifi -Provides: iwl100-firmware = 39.31.5.1-87 -Provides: iwl105-firmware = 18.168.6.1-87 -Provides: iwl135-firmware = 18.168.6.1-87 -Provides: iwl1000-firmware = 1:39.31.5.1-87 -Provides: iwl2000-firmware = 18.168.6.1-87 -Provides: iwl2030-firmware = 18.168.6.1-87 -Provides: iwl3160-firmware = 1:25.30.13.0-87 -Provides: iwl3945-firmware = 15.32.2.9-87 -Provides: iwl4965-firmware = 228.61.2.24-87 -Provides: iwl5000-firmware = 8.83.5.1_1-87 -Provides: iwl5150-firmware = 8.24.2.2-87 -Provides: iwl6000-firmware = 9.221.4.1-87 -Provides: iwl6000g2a-firmware = 18.168.6.1-87 -Provides: iwl6000g2b-firmware = 18.168.6.1-87 -Provides: iwl6050-firmware = 41.28.5.1-87 -Provides: iwl7260-firmware = 1:25.30.13.0-87 - -Obsoletes: iwl100-firmware -Obsoletes: iwl1000-firmware -Obsoletes: iwl3160-firmware -Obsoletes: iwl3945-firmware -Obsoletes: iwl4965-firmware -Obsoletes: iwl5000-firmware -Obsoletes: iwl5150-firmware -Obsoletes: iwl6000-firmware -Obsoletes: iwl6000g2a-firmware -Obsoletes: iwl6000g2b-firmware -Obsoletes: iwl6050-firmware -Obsoletes: iwl7260-firmware +Provides: iwl100-firmware = %{version}-%{release} +Provides: iwl105-firmware = %{version}-%{release} +Provides: iwl135-firmware = %{version}-%{release} +Provides: iwl1000-firmware = 1:%{version}-%{release} +Provides: iwl2000-firmware = %{version}-%{release} +Provides: iwl2030-firmware = %{version}-%{release} +Provides: iwl3160-firmware = 1:%{version}-%{release} +Provides: iwl3945-firmware = %{version}-%{release} +Provides: iwl4965-firmware = %{version}-%{release} +Provides: iwl5000-firmware = %{version}-%{release} +Provides: iwl5150-firmware = %{version}-%{release} +Provides: iwl6000-firmware = %{version}-%{release} +Provides: iwl6000g2a-firmware = %{version}-%{release} +Provides: iwl6000g2b-firmware = %{version}-%{release} +Provides: iwl6050-firmware = %{version}-%{release} +Provides: iwl7260-firmware = 1:%{version}-%{release} + +Obsoletes: iwl100-firmware < %{version}-%{release} +Obsoletes: iwl1000-firmware < 1:%{version}-%{release} +Obsoletes: iwl3160-firmware < 1:%{version}-%{release} +Obsoletes: iwl3945-firmware < %{version}-%{release} +Obsoletes: iwl4965-firmware < %{version}-%{release} +Obsoletes: iwl5000-firmware < %{version}-%{release} +Obsoletes: iwl5150-firmware < %{version}-%{release} +Obsoletes: iwl6000-firmware < %{version}-%{release} +Obsoletes: iwl6000g2a-firmware < %{version}-%{release} +Obsoletes: iwl6000g2b-firmware < %{version}-%{release} +Obsoletes: iwl6050-firmware < %{version}-%{release} +Obsoletes: iwl7260-firmware < 1:%{version}-%{release} %description iwlwifi This package contains firmware images required by some devices. %prep -%autosetup -p1 +%autosetup -p1 -S git + +# collect all the license, and delete those will be put into sub packages +mkdir -p LICENCES +cp LICENCE.* LICENSE.* LICENCES/ +pushd LICENCES +rm -f LICENCE.atheros_firmware +rm -f LICENCE.iwlwifi_firmware +rm -f LICENCE.Marvell +rm -f LICENCE.OLPC +rm -f LICENCE.mediatek +rm -f LICENCE.ralink_a_mediatek_company_firmware +rm -f LICENCE.Marvell +rm -f LICENCE.Netronome +rm -f LICENCE.cypress +rm -f LICENCE.ti-connectivity +popd %build %install -mkdir -p %{buildroot}/%{_lib_path} -mkdir -p %{buildroot}/%{_license_path} +mkdir -p %{buildroot}/%{_lib_path}/updates cp -r * %{buildroot}/%{_lib_path} -cp -r WHENCE LICENCE.* %{buildroot}/%{_license_path} rm %{buildroot}/%{_lib_path}/{WHENCE,LICENCE.*,LICENSE.*} -make COPYOPTS="--ignore-duplicates" DESTDIR=%{buildroot} FIRMWAREDIR=%{_lib_path} install +make COPYOPTS="-v --ignore-duplicates" DESTDIR=%{buildroot} FIRMWAREDIR=%{_lib_path} install pushd %{buildroot}/%{_lib_path} rm -f usbdux/*dux */*.asm @@ -141,10 +156,10 @@ popd %files %dir %{_lib_path} -%dir %{_license_path} -%license WHENCE LICENCE.* LICENSE.* -%{_license_path}/* +%license WHENCE +%license LICENCES/* %{_lib_path}/* +%exclude %{_lib_path}/ar3k %exclude %{_lib_path}/ath* %exclude %{_lib_path}/libertas %exclude %{_lib_path}/mediatek @@ -155,31 +170,42 @@ popd %exclude %{_lib_path}/iwlwifi* %files ath +%license LICENCE.atheros_firmware +%{_lib_path}/ar3k %{_lib_path}/ath* %files iwlwifi +%license LICENCE.iwlwifi_firmware %{_lib_path}/iwlwifi* %files libertas +%license LICENCE.Marvell LICENCE.OLPC %{_lib_path}/libertas %files mediatek +%license LICENCE.mediatek LICENCE.ralink_a_mediatek_company_firmware %{_lib_path}/mediatek %files mrvl +%license LICENCE.Marvell %{_lib_path}/mrvl %files netronome +%license LICENCE.Netronome %{_lib_path}/netronome %files cypress +%license LICENCE.cypress %{_lib_path}/cypress %files ti-connectivity +%license LICENCE.ti-connectivity %{_lib_path}/ti-connectivity - %changelog +* Tue Oct 22 2024 Funda Wang - 20241017-1 +- update to 20241017 + * Thu Sep 19 2024 wangxiao - 20240811-2 - need use copy-firmware.sh, modify the process of build and install -- Gitee