From b94b3a66333ebc23fa07d6c039f56c880958e095 Mon Sep 17 00:00:00 2001 From: lxoliva Date: Tue, 24 Mar 2009 20:54:10 +0000 Subject: [PATCH] Fix deblobbing of sb_common.c. Don't run clean_blob on Kconfig files. Remove blob names from drivers/base/Kconfig with clean_sed. git-svn-id: http://www.fsfla.org/svn/fsfla/software/linux-libre/scripts@4797 559672b5-ba27-0410-b829-e8f1faed8b1b --- deblob-2.6.28 | 4 ++-- deblob-check | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/deblob-2.6.28 b/deblob-2.6.28 index 5f6b2970c88..4add46e609c 100755 --- a/deblob-2.6.28 +++ b/deblob-2.6.28 @@ -44,7 +44,7 @@ # For each kver release, start extra with an empty string, then count # from 1 if changes are needed that require rebuilding the tarball. -kver=2.6.28 extra=1 +kver=2.6.28 extra=1++ fatal () { echo "$@" @@ -1810,7 +1810,7 @@ clean_blob Documentation/sound/oss/PSS clean_blob Documentation/sound/oss/PSS-updates clean_file Documentation/dvb/get_dvb_firmware clean_file Documentation/video4linux/extract_xc3028.pl -clean_blob drivers/base/Kconfig +clean_sed s,usb8388,whatever,g drivers/base/Kconfig 'removed blob name' clean_blob firmware/WHENCE exit 0 diff --git a/deblob-check b/deblob-check index e1bdb0dd0af..21c188dc7c2 100755 --- a/deblob-check +++ b/deblob-check @@ -866,6 +866,7 @@ set_except () { accept 'There is an USB interface for downloading[/]uploading.*request_firmware interface\.' Documentation/video4linux/si470x.txt accept '[\t]- move firmware loading to request_firmware()' drivers/staging/slicoss/README accept 'config FIRMWARE_IN_KERNEL.*let firmware be loaded from userspace\.' drivers/base/Kconfig + accept '[ ]*and request_firmware() in the source' drivers/base/Kconfig accept 'static int[\n]_request_firmware(const struct firmware \*\*firmware_p, const char \*name,[^{]*[\n]{[\n]\([^}]\|[^\n}]}*\)*[\n]}[\n]' drivers/base/firmware_class.c accept 'static int[\n]request_firmware_work_func(void \*arg)[\n]{[\n]\([^}]\|[^\n}]}*\)*ret = _request_firmware(\([^}]\|[^\n}]}*\)*[\n]}[\n]' drivers/base/firmware_class.c accept '[/][*][*][\n] [*] request_firmware: - send firmware [^{]*[\n]{[\n]\([^}]\|[^\n}]}*\)*[\n]}[\n]' drivers/base/firmware_class.c @@ -1283,7 +1284,8 @@ set_except () { blobname '\([/]etc[/]sound[/]\)\?trxpro\.bin' sound/oss/trix.c accept ' smw_ucodeLen = mod_firwmare_load(' sound/oss/sb_common.c - blobname '\([/]etc[/]sound[/]\)\?msnd\(init\|perm\)\.bin' sound/oss/sb_common.c + blobname '\([/]etc[/]sound[/]\)\?midi0001\.bin' sound/oss/sb_common.c + blobname '\([/]etc[/]sound[/]\)\?msnd\(init\|perm\)\.bin' sound/oss/Kconfig blob 'When the module is loaded\([^\n]\|[\n][^\n]\)*[/]pss_synth\([^\n]\|[\n][^\n]\)*' Documentation/sound/oss/PSS blob 'pss_firmware[ \n ]*This parameter\([^\n]\|[\n][^\n]\)*[/]pss_synth\([^\n]\|[\n][^\n]\)*' Documentation/sound/oss/PSS-updates -- 2.31.1