From f1601ec3f752e0b2fdfb2358ca11a62c55305d12 Mon Sep 17 00:00:00 2001 From: lxoliva Date: Sat, 6 Apr 2019 06:19:45 +0000 Subject: [PATCH] Updates for 5.0.7 and 4.19.34 git-svn-id: http://www.fsfla.org/svn/fsfla/software/linux-libre/scripts@16156 559672b5-ba27-0410-b829-e8f1faed8b1b --- deblob-4.19 | 6 +++++- deblob-5.0 | 6 +++++- deblob-check | 5 ++++- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/deblob-4.19 b/deblob-4.19 index 770eff24a56..2851cb0b665 100755 --- a/deblob-4.19 +++ b/deblob-4.19 @@ -1879,7 +1879,11 @@ clean_mk CONFIG_BRCMSMAC drivers/net/wireless/broadcom/brcm80211/Makefile announce BRCMFMAC - "Broadcom IEEE802.11n embedded FullMAC WLAN driver" reject_firmware drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c -reject_firmware drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c +if grep -q firmware_request_nowarn drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c; then + reject_firmware_nowarn drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c +else + reject_firmware drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c +fi clean_blob drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c clean_blob drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h clean_kconfig drivers/net/wireless/broadcom/brcm80211/Kconfig BRCMFMAC diff --git a/deblob-5.0 b/deblob-5.0 index dba92915b0d..e30d3db459c 100755 --- a/deblob-5.0 +++ b/deblob-5.0 @@ -1890,7 +1890,11 @@ clean_mk CONFIG_BRCMSMAC drivers/net/wireless/broadcom/brcm80211/Makefile announce BRCMFMAC - "Broadcom IEEE802.11n embedded FullMAC WLAN driver" reject_firmware drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c -reject_firmware drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c +if grep -q firmware_request_nowarn drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c; then + reject_firmware_nowarn drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c +else + reject_firmware drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c +fi clean_blob drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c clean_blob drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h clean_kconfig drivers/net/wireless/broadcom/brcm80211/Kconfig BRCMFMAC diff --git a/deblob-check b/deblob-check index fbdd3543a68..25ed9ff73c4 100755 --- a/deblob-check +++ b/deblob-check @@ -1,6 +1,6 @@ #! /bin/sh -# deblob-check version 2019-02-11 +# deblob-check version 2019-04-06 # Inspired in gNewSense's find-firmware script. # Written by Alexandre Oliva @@ -5304,6 +5304,9 @@ set_except () { blobname 'intel[/]sof-bdw\(\.ri\|-\(rt286\|rt5677\|rt5640\)\.tplg\)' sound/soc/intel/common/soc-acpi-intel-hsw-bdw-match.c accept '[\t][\t]pr_err[(]["]%s:[ ]request_firmware[ ]error' drivers/net/wireless/quantenna/qtnfmac/pcie/topaz_pcie.c + # New in 5.0.7. + accept '[\t]*[/]bin[/]bash[ ]["]tests[/][$][{]testname[}]\.sh["][ ][<][ ]["]tests[/][$][{]testname[}]\.vg\.out["]' tools/lib/lockdep/run_tests.sh + ;; */*freedo*.patch | */*logo*.patch) -- 2.31.1