diff options
| author | Alexandre Oliva <lxoliva@fsfla.org> | 2009-03-24 20:54:10 +0000 |
|---|---|---|
| committer | Alexandre Oliva <lxoliva@fsfla.org> | 2009-03-24 20:54:10 +0000 |
| commit | f045ec773b5e00dee2a352e808b64c873f76f44b (patch) | |
| tree | 470b912bf938c3b22812c17c176bf810dcfeb0b4 /scripts | |
| parent | 3f65aa07cff6c8c6147827c12fd3a78e6f83baf3 (diff) | |
| download | linux-libre-raptor-f045ec773b5e00dee2a352e808b64c873f76f44b.tar.gz linux-libre-raptor-f045ec773b5e00dee2a352e808b64c873f76f44b.zip | |
Fix deblobbing of sb_common.c.
Don't run clean_blob on Kconfig files.
Remove blob names from drivers/base/Kconfig with clean_sed.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/deblob-2.6.28 | 4 | ||||
| -rwxr-xr-x | scripts/deblob-check | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/scripts/deblob-2.6.28 b/scripts/deblob-2.6.28 index 5f6b2970c..4add46e60 100755 --- a/scripts/deblob-2.6.28 +++ b/scripts/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/scripts/deblob-check b/scripts/deblob-check index e1bdb0dd0..21c188dc7 100755 --- a/scripts/deblob-check +++ b/scripts/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 |
