Latest snapshot, spec cleanups, use autosetup for patches, add initial RPi3 wifi nvram for wider testing

This commit is contained in:
Peter Robinson 2018-10-01 14:21:30 +01:00
parent 736b3eae7b
commit 7b9c6b5630
2 changed files with 32 additions and 40 deletions

View File

@ -1,11 +1,11 @@
%global checkout f1b95fe5 %global checkout 44d4fca9
%global firmware_release 86 %global firmware_release 87
%global _firmwarepath /usr/lib/firmware %global _firmwarepath /usr/lib/firmware
%define _binaries_in_noarch_packages_terminate_build 0 %define _binaries_in_noarch_packages_terminate_build 0
Name: linux-firmware Name: linux-firmware
Version: 20180815 Version: 20180913
Release: %{firmware_release}.git%{checkout}%{?dist} Release: %{firmware_release}.git%{checkout}%{?dist}
Summary: Firmware files used by the Linux kernel Summary: Firmware files used by the Linux kernel
License: GPL+ and GPLv2+ and MIT and Redistributable, no modification permitted License: GPL+ and GPLv2+ and MIT and Redistributable, no modification permitted
@ -15,6 +15,8 @@ BuildArch: noarch
# git archive --format=tar --prefix=linux-firmware-%{checkout}/ %{checkout} | xz > linux-firmware-%{version}.tar.xz # git archive --format=tar --prefix=linux-firmware-%{checkout}/ %{checkout} | xz > linux-firmware-%{version}.tar.xz
Source0: %{name}-%{version}.tar.xz Source0: %{name}-%{version}.tar.xz
Patch1: 0001-brcm-add-nvram-for-the-Raspberry-Pi-3B-and-3B.patch
Provides: kernel-firmware = %{version} xorg-x11-drv-ati-firmware = 7.0 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 Obsoletes: kernel-firmware < %{version} xorg-x11-drv-ati-firmware < 6.13.0-0.22
Obsoletes: ueagle-atm4-firmware < 1.0-5 Obsoletes: ueagle-atm4-firmware < 1.0-5
@ -29,8 +31,6 @@ Obsoletes: rt73usb-firmware < 1.8-11
Obsoletes: cx18-firmware < 20080628-10 Obsoletes: cx18-firmware < 20080628-10
Conflicts: microcode_ctl < 2.1-0 Conflicts: microcode_ctl < 2.1-0
BuildRequires: git
%description %description
This package includes firmware files required for some devices to This package includes firmware files required for some devices to
operate. operate.
@ -39,7 +39,7 @@ operate.
Summary: Firmware for Intel(R) Wireless WiFi Link 100 Series Adapters Summary: Firmware for Intel(R) Wireless WiFi Link 100 Series Adapters
License: Redistributable, no modification permitted License: Redistributable, no modification permitted
Version: 39.31.5.1 Version: 39.31.5.1
Release: %{firmware_release}%{?dist}.1 Release: %{firmware_release}%{?dist}
Obsoletes: iwl100-firmware < 39.31.5.1-4 Obsoletes: iwl100-firmware < 39.31.5.1-4
%description -n iwl100-firmware %description -n iwl100-firmware
This package contains the firmware required by the Intel wireless drivers This package contains the firmware required by the Intel wireless drivers
@ -51,7 +51,7 @@ LICENSE file. Please read it carefully.
Summary: Firmware for Intel(R) Centrino Wireless-N 105 Series Adapters Summary: Firmware for Intel(R) Centrino Wireless-N 105 Series Adapters
License: Redistributable, no modification permitted License: Redistributable, no modification permitted
Version: 18.168.6.1 Version: 18.168.6.1
Release: %{firmware_release}%{?dist}.1 Release: %{firmware_release}%{?dist}
%description -n iwl105-firmware %description -n iwl105-firmware
This package contains the firmware required by the Intel wireless drivers This package contains the firmware required by the Intel wireless drivers
for Linux to support the iwl105 hardware. Usage of the firmware for Linux to support the iwl105 hardware. Usage of the firmware
@ -62,7 +62,7 @@ LICENSE file. Please read it carefully.
Summary: Firmware for Intel(R) Centrino Wireless-N 135 Series Adapters Summary: Firmware for Intel(R) Centrino Wireless-N 135 Series Adapters
License: Redistributable, no modification permitted License: Redistributable, no modification permitted
Version: 18.168.6.1 Version: 18.168.6.1
Release: %{firmware_release}%{?dist}.1 Release: %{firmware_release}%{?dist}
%description -n iwl135-firmware %description -n iwl135-firmware
This package contains the firmware required by the Intel wireless drivers This package contains the firmware required by the Intel wireless drivers
for Linux to support the iwl135 hardware. Usage of the firmware for Linux to support the iwl135 hardware. Usage of the firmware
@ -74,7 +74,7 @@ Summary: Firmware for Intel® PRO/Wireless 1000 B/G/N network adaptors
License: Redistributable, no modification permitted License: Redistributable, no modification permitted
Version: 39.31.5.1 Version: 39.31.5.1
Epoch: 1 Epoch: 1
Release: %{firmware_release}%{?dist}.1 Release: %{firmware_release}%{?dist}
Obsoletes: iwl1000-firmware < 1:39.31.5.1-3 Obsoletes: iwl1000-firmware < 1:39.31.5.1-3
%description -n iwl1000-firmware %description -n iwl1000-firmware
This package contains the firmware required by the Intel wireless drivers This package contains the firmware required by the Intel wireless drivers
@ -86,7 +86,7 @@ LICENSE file. Please read it carefully.
Summary: Firmware for Intel(R) Centrino Wireless-N 2000 Series Adapters Summary: Firmware for Intel(R) Centrino Wireless-N 2000 Series Adapters
License: Redistributable, no modification permitted License: Redistributable, no modification permitted
Version: 18.168.6.1 Version: 18.168.6.1
Release: %{firmware_release}%{?dist}.1 Release: %{firmware_release}%{?dist}
%description -n iwl2000-firmware %description -n iwl2000-firmware
This package contains the firmware required by the Intel wireless drivers This package contains the firmware required by the Intel wireless drivers
for Linux to support the iwl2000 hardware. Usage of the firmware for Linux to support the iwl2000 hardware. Usage of the firmware
@ -97,7 +97,7 @@ LICENSE file. Please read it carefully.
Summary: Firmware for Intel(R) Centrino Wireless-N 2030 Series Adapters Summary: Firmware for Intel(R) Centrino Wireless-N 2030 Series Adapters
License: Redistributable, no modification permitted License: Redistributable, no modification permitted
Version: 18.168.6.1 Version: 18.168.6.1
Release: %{firmware_release}%{?dist}.1 Release: %{firmware_release}%{?dist}
%description -n iwl2030-firmware %description -n iwl2030-firmware
This package contains the firmware required by the Intel wireless drivers This package contains the firmware required by the Intel wireless drivers
for Linux to support the iwl2030 hardware. Usage of the firmware for Linux to support the iwl2030 hardware. Usage of the firmware
@ -109,7 +109,7 @@ Summary: Firmware for Intel(R) Wireless WiFi Link 3160 Series Adapters
License: Redistributable, no modification permitted License: Redistributable, no modification permitted
Epoch: 1 Epoch: 1
Version: 25.30.13.0 Version: 25.30.13.0
Release: %{firmware_release}%{?dist}.1 Release: %{firmware_release}%{?dist}
%description -n iwl3160-firmware %description -n iwl3160-firmware
This package contains the firmware required by the Intel wireless drivers This package contains the firmware required by the Intel wireless drivers
for Linux. Usage of the firmware is subject to the terms and conditions for Linux. Usage of the firmware is subject to the terms and conditions
@ -119,7 +119,7 @@ contained inside the provided LICENSE file. Please read it carefully.
Summary: Firmware for Intel® PRO/Wireless 3945 A/B/G network adaptors Summary: Firmware for Intel® PRO/Wireless 3945 A/B/G network adaptors
License: Redistributable, no modification permitted License: Redistributable, no modification permitted
Version: 15.32.2.9 Version: 15.32.2.9
Release: %{firmware_release}%{?dist}.1 Release: %{firmware_release}%{?dist}
Obsoletes: iwl3945-firmware < 15.32.2.9-7 Obsoletes: iwl3945-firmware < 15.32.2.9-7
%description -n iwl3945-firmware %description -n iwl3945-firmware
This package contains the firmware required by the iwl3945 driver This package contains the firmware required by the iwl3945 driver
@ -130,7 +130,7 @@ contained inside the provided LICENSE file. Please read it carefully.
Summary: Firmware for Intel® PRO/Wireless 4965 A/G/N network adaptors Summary: Firmware for Intel® PRO/Wireless 4965 A/G/N network adaptors
License: Redistributable, no modification permitted License: Redistributable, no modification permitted
Version: 228.61.2.24 Version: 228.61.2.24
Release: %{firmware_release}%{?dist}.1 Release: %{firmware_release}%{?dist}
Obsoletes: iwl4965-firmware < 228.61.2.24-5 Obsoletes: iwl4965-firmware < 228.61.2.24-5
%description -n iwl4965-firmware %description -n iwl4965-firmware
This package contains the firmware required by the iwl4965 driver This package contains the firmware required by the iwl4965 driver
@ -141,7 +141,7 @@ contained inside the provided LICENSE file. Please read it carefully.
Summary: Firmware for Intel® PRO/Wireless 5000 A/G/N network adaptors Summary: Firmware for Intel® PRO/Wireless 5000 A/G/N network adaptors
License: Redistributable, no modification permitted License: Redistributable, no modification permitted
Version: 8.83.5.1_1 Version: 8.83.5.1_1
Release: %{firmware_release}%{?dist}.1 Release: %{firmware_release}%{?dist}
Obsoletes: iwl5000-firmware < 8.83.5.1_1-3 Obsoletes: iwl5000-firmware < 8.83.5.1_1-3
%description -n iwl5000-firmware %description -n iwl5000-firmware
This package contains the firmware required by the iwl5000 driver This package contains the firmware required by the iwl5000 driver
@ -152,7 +152,7 @@ contained inside the provided LICENSE file. Please read it carefully.
Summary: Firmware for Intel® PRO/Wireless 5150 A/G/N network adaptors Summary: Firmware for Intel® PRO/Wireless 5150 A/G/N network adaptors
License: Redistributable, no modification permitted License: Redistributable, no modification permitted
Version: 8.24.2.2 Version: 8.24.2.2
Release: %{firmware_release}%{?dist}.1 Release: %{firmware_release}%{?dist}
Obsoletes: iwl5150-firmware < 8.24.2.2-4 Obsoletes: iwl5150-firmware < 8.24.2.2-4
%description -n iwl5150-firmware %description -n iwl5150-firmware
This package contains the firmware required by the iwl5150 driver This package contains the firmware required by the iwl5150 driver
@ -163,7 +163,7 @@ contained inside the provided LICENSE file. Please read it carefully.
Summary: Firmware for Intel(R) Wireless WiFi Link 6000 AGN Adapter Summary: Firmware for Intel(R) Wireless WiFi Link 6000 AGN Adapter
License: Redistributable, no modification permitted License: Redistributable, no modification permitted
Version: 9.221.4.1 Version: 9.221.4.1
Release: %{firmware_release}%{?dist}.1 Release: %{firmware_release}%{?dist}
Obsoletes: iwl6000-firmware < 9.221.4.1-4 Obsoletes: iwl6000-firmware < 9.221.4.1-4
%description -n iwl6000-firmware %description -n iwl6000-firmware
This package contains the firmware required by the Intel wireless drivers This package contains the firmware required by the Intel wireless drivers
@ -174,7 +174,7 @@ contained inside the provided LICENSE file. Please read it carefully.
Summary: Firmware for Intel(R) Wireless WiFi Link 6005 Series Adapters Summary: Firmware for Intel(R) Wireless WiFi Link 6005 Series Adapters
License: Redistributable, no modification permitted License: Redistributable, no modification permitted
Version: 18.168.6.1 Version: 18.168.6.1
Release: %{firmware_release}%{?dist}.1 Release: %{firmware_release}%{?dist}
Obsoletes: iwl6000g2a-firmware < 17.168.5.3-3 Obsoletes: iwl6000g2a-firmware < 17.168.5.3-3
%description -n iwl6000g2a-firmware %description -n iwl6000g2a-firmware
This package contains the firmware required by the Intel wireless drivers This package contains the firmware required by the Intel wireless drivers
@ -185,7 +185,7 @@ contained inside the provided LICENSE file. Please read it carefully.
Summary: Firmware for Intel(R) Wireless WiFi Link 6030 Series Adapters Summary: Firmware for Intel(R) Wireless WiFi Link 6030 Series Adapters
License: Redistributable, no modification permitted License: Redistributable, no modification permitted
Version: 18.168.6.1 Version: 18.168.6.1
Release: %{firmware_release}%{?dist}.1 Release: %{firmware_release}%{?dist}
Obsoletes: iwl6000g2b-firmware < 17.168.5.2-3 Obsoletes: iwl6000g2b-firmware < 17.168.5.2-3
%description -n iwl6000g2b-firmware %description -n iwl6000g2b-firmware
This package contains the firmware required by the Intel wireless drivers This package contains the firmware required by the Intel wireless drivers
@ -196,7 +196,7 @@ contained inside the provided LICENSE file. Please read it carefully.
Summary: Firmware for Intel(R) Wireless WiFi Link 6050 Series Adapters Summary: Firmware for Intel(R) Wireless WiFi Link 6050 Series Adapters
License: Redistributable, no modification permitted License: Redistributable, no modification permitted
Version: 41.28.5.1 Version: 41.28.5.1
Release: %{firmware_release}%{?dist}.1 Release: %{firmware_release}%{?dist}
Obsoletes: iwl6050-firmware < 41.28.5.1-5 Obsoletes: iwl6050-firmware < 41.28.5.1-5
%description -n iwl6050-firmware %description -n iwl6050-firmware
This package contains the firmware required by the Intel wireless drivers This package contains the firmware required by the Intel wireless drivers
@ -208,7 +208,7 @@ Summary: Firmware for Intel(R) Wireless WiFi Link 726x/8000/9000 Series Adapters
License: Redistributable, no modification permitted License: Redistributable, no modification permitted
Epoch: 1 Epoch: 1
Version: 25.30.13.0 Version: 25.30.13.0
Release: %{firmware_release}%{?dist}.1 Release: %{firmware_release}%{?dist}
%description -n iwl7260-firmware %description -n iwl7260-firmware
This package contains the firmware required by the Intel wireless drivers This package contains the firmware required by the Intel wireless drivers
for Linux. Usage of the firmware is subject to the terms and conditions for Linux. Usage of the firmware is subject to the terms and conditions
@ -243,19 +243,7 @@ License: Redistributable, no modification permitted
Firmware for Marvell Libertas SD 8787 Network Adapter Firmware for Marvell Libertas SD 8787 Network Adapter
%prep %prep
%setup -q -n linux-firmware-%{checkout} %autosetup -p1 -n linux-firmware-%{checkout}
%if 0
git init .
if [ -z "$GIT_COMMITTER_NAME" ]; then
git config user.email "nobody@fedoraproject.org"
git config user.name "Fedora linux-firmware packagers"
fi
git add .
git commit -m init .
git am %{patches}
%endif
%build %build
# Remove firmware shipped in separate packages already # Remove firmware shipped in separate packages already
@ -278,14 +266,14 @@ rm -f ctefx.bin ctspeq.bin
rm -f check_whence.py rm -f check_whence.py
%install %install
mkdir -p $RPM_BUILD_ROOT/%{_firmwarepath} mkdir -p %{buildroot}/%{_firmwarepath}
mkdir -p $RPM_BUILD_ROOT/%{_firmwarepath}/updates mkdir -p %{buildroot}/%{_firmwarepath}/updates
cp -r * $RPM_BUILD_ROOT/%{_firmwarepath} cp -r * %{buildroot}/%{_firmwarepath}
rm $RPM_BUILD_ROOT/%{_firmwarepath}/{WHENCE,LICENCE.*,LICENSE.*} rm %{buildroot}/%{_firmwarepath}/{WHENCE,LICENCE.*,LICENSE.*}
# Create file list but exclude firmwares that we place in subpackages # Create file list but exclude firmwares that we place in subpackages
FILEDIR=`pwd` FILEDIR=`pwd`
pushd $RPM_BUILD_ROOT/%{_firmwarepath} pushd %{buildroot}/%{_firmwarepath}
find . \! -type d > $FILEDIR/linux-firmware.files find . \! -type d > $FILEDIR/linux-firmware.files
find . -type d | sed -e '/^.$/d' > $FILEDIR/linux-firmware.dirs find . -type d | sed -e '/^.$/d' > $FILEDIR/linux-firmware.dirs
popd popd
@ -395,6 +383,10 @@ sed -e 's/^/%%dir /' linux-firmware.dirs >> linux-firmware.files
%license WHENCE LICENCE.* LICENSE.* %license WHENCE LICENCE.* LICENSE.*
%changelog %changelog
* Mon Oct 1 2018 Peter Robinson <pbrobinson@fedoraproject.org> 20180913-87.git44d4fca9
- Latest upstream snapshot
- Minor spec cleanups
* Wed Aug 15 2018 Josh Boyer <jwboyer@fedoraproject.org> - 20180815-86.gitf1b95fe5 * Wed Aug 15 2018 Josh Boyer <jwboyer@fedoraproject.org> - 20180815-86.gitf1b95fe5
- Latest upstream snapshot - Latest upstream snapshot

View File

@ -1 +1 @@
SHA512 (linux-firmware-20180815.tar.xz) = 77589410f71761bc4a27cfe6a3679275e227c3db7ff30468d24c146d5f628b4869fe5b8e058b57fd331ec19e1105a8cef9c28a4edad22fa16f7d48ea1c4b2608 SHA512 (linux-firmware-20180913.tar.xz) = 9e97b17ba5fab6f75252092d03d9f859d9426f8271ed2133ebf8ce3da44c1b7ad8ea52ce134f7d4e3a054adca438e3c3357e9d7ab98c944dd53249e06d8101b9