diff --git a/SOURCES/0001-brcm-Raspberry-Pi-3A-WiFi-NVRAM-support.patch b/SOURCES/0001-brcm-Raspberry-Pi-3A-WiFi-NVRAM-support.patch index d1f8b044..a3c297a4 100644 --- a/SOURCES/0001-brcm-Raspberry-Pi-3A-WiFi-NVRAM-support.patch +++ b/SOURCES/0001-brcm-Raspberry-Pi-3A-WiFi-NVRAM-support.patch @@ -20,5 +20,6 @@ index 0000000..36b5530 @@ -0,0 +1 @@ +brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt \ No newline at end of file --- +-- 2.20.1 + diff --git a/SOURCES/0002-brcm-Raspberry-Pi-Update-ccode-to-X2.patch b/SOURCES/0002-brcm-Raspberry-Pi-Update-ccode-to-X2.patch index e46bb40c..1b31c431 100644 --- a/SOURCES/0002-brcm-Raspberry-Pi-Update-ccode-to-X2.patch +++ b/SOURCES/0002-brcm-Raspberry-Pi-Update-ccode-to-X2.patch @@ -35,7 +35,7 @@ index 732c19b..38a99db 100644 papdvalidtest=1 prodid=0x0726 propbw202gpo=0xdd --spurconfig=0x3 +-spurconfig=0x3 +spurconfig=0x3 sromrev=11 txpwrbckof=6 @@ -52,5 +52,6 @@ index ba94f54..8d01fcf 100644 deadman_to=481500000 devid=0x43ab dot11agofdmhrbw202gpo=0x4442 --- +-- 2.20.1 + diff --git a/SPECS/linux-firmware.spec b/SPECS/linux-firmware.spec index f45a81cf..c592fe3a 100644 --- a/SPECS/linux-firmware.spec +++ b/SPECS/linux-firmware.spec @@ -1,11 +1,11 @@ # global checkout 710963fe -%global firmware_release 99 +%global firmware_release 101 %global _firmwarepath /usr/lib/firmware %define _binaries_in_noarch_packages_terminate_build 0 Name: linux-firmware -Version: 20190717 +Version: 20190815 Release: %{firmware_release}%{?dist} Summary: Firmware files used by the Linux kernel License: GPL+ and GPLv2+ and MIT and Redistributable, no modification permitted @@ -36,6 +36,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 %description This package includes firmware files required for some devices to @@ -289,18 +290,34 @@ Requires: linux-firmware-whence Firmware for Netronome Smart NICs %prep -%autosetup -p1 +%setup -q tar -xvf %{SOURCE1} +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} + %build # Remove firmware shipped in separate packages already # Perhaps these should be built as subpackages of linux-firmware? rm -rf ess korg sb16 yamaha # Remove source files we don't need to install -rm -f usbdux/*dux */*.asm rm -rf carl9170fw +rm -rf cis/{src,Makefile} +rm -f atusb/ChangeLog +rm -f av7110/{Boot.S,Makefile} +rm -f dsp56k/{bootstrap.asm,concat-bootstrap.pl,Makefile} +rm -f iscis/{*.c,*.h,README,Makefile} +rm -f keyspan_pda/{keyspan_pda.S,xircom_pgs.S,Makefile} +rm -f usbdux/*dux */*.asm # No need to install old firmware versions where we also provide newer versions # which are preferred and support the same (or more) hardware @@ -310,14 +327,14 @@ rm -f libertas/usb8388_v5.bin # Remove firmware for Creative CA0132 HD as it's in alsa-firmware rm -f ctefx.bin ctspeq.bin -# Remove the check_whence.py file -rm -f check_whence.py +# 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}/{WHENCE,LICENCE.*,LICENSE.*} +rm %{buildroot}/%{_firmwarepath}/{GPL*,WHENCE,LICENCE.*,LICENSE.*} # Create file list but exclude firmwares that we place in subpackages FILEDIR=`pwd` @@ -338,6 +355,10 @@ sed -i -e 's/^/"/;s/$/"/' linux-firmware.files sed -e 's/^/%%dir /' linux-firmware.dirs >> linux-firmware.files +%files -f linux-firmware.files +%dir %{_firmwarepath} +%license LICENCE.* LICENSE.* GPL* + %files whence %license WHENCE @@ -434,10 +455,6 @@ sed -e 's/^/%%dir /' linux-firmware.dirs >> linux-firmware.files %dir %{_firmwarepath}/mrvl %{_firmwarepath}/mrvl/sd8787* -%files -f linux-firmware.files -%dir %{_firmwarepath} -%license LICENCE.* LICENSE.* - %files -n liquidio-firmware %license LICENCE.cavium_liquidio %dir %{_firmwarepath}/liquidio @@ -449,6 +466,15 @@ sed -e 's/^/%%dir /' linux-firmware.dirs >> linux-firmware.files %{_firmwarepath}/netronome/* %changelog +* Thu Aug 15 2019 Peter Robinson 20190815-101 +- Updates for various ath10k and rtw88 Wireless firmwares +- Update NXP Layerscape Management Complex firmware +- update Agilio SmartNIC flower firmware +- cxgb4 firmware update + +* Tue Aug 6 2019 Peter Robinson 20190717-100 +- Pull in upstream intel iwliwfi firmware updates WiFi/BT firmware issues (RHBZ 1733369) + * Wed Jul 17 2019 Peter Robinson 20190717-99 - Update to upstream 20190717 release - New/updated Intel iwlwifi/bluetooth firmware for various generations