diff --git a/linux-firmware.spec b/linux-firmware.spec index 7846d15..e3bf3c3 100644 --- a/linux-firmware.spec +++ b/linux-firmware.spec @@ -1,10 +1,10 @@ -%global firmware_release 102 +%global firmware_release 103 %global _firmwarepath /usr/lib/firmware %define _binaries_in_noarch_packages_terminate_build 0 Name: linux-firmware -Version: 20190923 +Version: 20191022 Release: %{firmware_release}%{?dist} Summary: Firmware files used by the Linux kernel License: GPL+ and GPLv2+ and MIT and Redistributable, no modification permitted @@ -34,7 +34,7 @@ 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-core +BuildRequires: git-core make %description This package includes firmware files required for some devices to @@ -301,6 +301,14 @@ git commit -m init . git am %{patches} %build + +%install +mkdir -p %{buildroot}/%{_firmwarepath} +mkdir -p %{buildroot}/%{_firmwarepath}/updates +make DESTDIR=%{buildroot}/ FIRMWAREDIR=%{_firmwarepath} install + +#Cleanup files we don't want to ship +pushd %{buildroot}/%{_firmwarepath} # Remove firmware shipped in separate packages already # Perhaps these should be built as subpackages of linux-firmware? rm -rf ess korg sb16 yamaha @@ -325,12 +333,7 @@ rm -f ctefx.bin ctspeq.bin # Remove superfluous infra files rm -f check_whence.py configure Makefile README - -%install -mkdir -p %{buildroot}/%{_firmwarepath} -mkdir -p %{buildroot}/%{_firmwarepath}/updates -cp -r * %{buildroot}/%{_firmwarepath} -rm %{buildroot}/%{_firmwarepath}/{GPL*,WHENCE,LICENCE.*,LICENSE.*} +popd # Create file list but exclude firmwares that we place in subpackages FILEDIR=`pwd` @@ -462,6 +465,9 @@ sed -e 's/^/%%dir /' linux-firmware.dirs >> linux-firmware.files %{_firmwarepath}/netronome/* %changelog +* Tue Oct 22 2019 Josh Boyer 20191022-103 +- Rework to use upstream install + * Mon Sep 23 2019 Peter Robinson 20190923-102 - Update Intel WiFi and Bluetooth firmwares - Mellanox new mlxsw_spectrum firmware 13.2000.1886 diff --git a/sources b/sources index 94dadac..903a531 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (linux-firmware-20190923.tar.xz) = ccc05038909dbfd75e93d5a9d5d7f66b7d24e50af46af4f7ab0209531c782290393c50043f33393e9e16b082a9d94a4ae060c1e1daec24f5f608f370965d5909 +SHA512 (linux-firmware-20191022.tar.xz) = e07e68d5c6363605743c52c1af69c80af055de6d6ac46050779ec6dfada68d0d7f0043df4377f23f31a3fcfcbd93b0c5df493bc49aee7231ed856ed1d65d4720