From: Freedo <freedo@linux-libre.fsfla.org>
Date: Sun, 23 Jul 2023 16:12:59 +0000 (+0000)
Subject: GNU Linux-libre 5.15.121-gnu scripts
X-Git-Tag: scripts/v5.15.121-gnu
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=c5f5c0f87a2adca5bbab43853a541a1af2d4391d;p=releases.git

GNU Linux-libre 5.15.121-gnu scripts
---

diff --git a/deblob-5.15 b/deblob-5.15
index b630c57ea70..fca1c708dfa 100755
--- a/deblob-5.15
+++ b/deblob-5.15
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-#    Copyright (C) 2008-2022 Alexandre Oliva <lxoliva@fsfla.org>
+#    Copyright (C) 2008-2023 Alexandre Oliva <lxoliva@fsfla.org>
 #    Copyright (C) 2008 Jeff Moe
 #    Copyright (C) 2009 Rubén Rodríguez <ruben@gnu.org>
 #
@@ -3885,6 +3885,9 @@ clean_blob arch/arm64/boot/dts/qcom/qrb5165-rb5.dts
 clean_blob arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
 clean_blob arch/arm64/boot/dts/qcom/sm8350-hdk.dts
 clean_blob arch/arm64/boot/dts/qcom/sm8350-mtp.dts
+if grep -q '/apq8016/' arch/arm64/boot/dts/qcom/apq8016-sbc.dts; then
+  clean_blob arch/arm64/boot/dts/qcom/apq8016-sbc.dts
+fi
 clean_kconfig arch/arm/mach-qcom/Kconfig ARCH_QCOM
 clean_mk CONFIG_ARCH_QCOM arch/arm64/boot/dts/qcom/Makefile
 
diff --git a/deblob-check b/deblob-check
index 09388b91e92..17a275e2927 100755
--- a/deblob-check
+++ b/deblob-check
@@ -21,6 +21,7 @@
 #        modified with 2023-03-17 r19120
 #        modified with 2023-05-17 r19267
 #        modified with 2023-06-09 r19312
+#        modified with 2021-12-20 r18515 (more partial)
 # Inspired in gNewSense's find-firmware script.
 # Written by Alexandre Oliva <lxoliva@fsfla.org>
 
@@ -6397,6 +6398,9 @@ set_except () {
     # New in 6.3.7, 6.1.33, 5.15.115, 5.10.183, 5.4.246.
     accept '[\t][\t]req->name[ ]=[ ]test_fw_config->name[;][\n][\t][\t]req->fw_buf[ ]=[ ]NULL[;][\n][\t][\t]req->fw[ ]=[ ]NULL[;][\n][\t][\t]req->idx[ ]=[ ]i[;][\n][\t][\t]init_completion[(][&]req->completion[)][;][\n][\t][\t]rc[ ]=[ ]request_firmware_nowait[(]THIS_MODULE[,][ ]\([^);, \t\n]*[,][ \t\n]*\)*trigger_batched_cb[)][;]' lib/test_firmware.c
 
+    # New in 5.15.121.
+    blobname 'qcom[/]apq8016[/]\(\(mba\|modem\|wcnss\)\.mbn\|WCNSS_qcom_wlan_nv_sbc\.bin\)' arch/arm64/boot/dts/qcom/apq8016-sbc.dts
+
     ;;
 
   */*freedo*.patch | */*logo*.patch)