Generalize the expression to match CIS request_firmware all the way

[releases.git] / deblob-2.6.33

diff --git a/deblob-2.6.33 b/deblob-2.6.33
index 2ee2bcaa576f20af254c7cd84b8efb2715abf54a..db76407ceb0c2c53cfaeb12a869e700fd85fe5f2 100755 (executable)
--- a/deblob-2.6.33
+++ b/deblob-2.6.33
@@ -37,15 +37,14 @@
 # See also:
 # http://wiki.debian.org/KernelFirmwareLicensing
 # svn://svn.debian.org/kernel/dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1
-# http://svn.gnewsense.svnhopper.net/gnewsense/builder/trunk/firmware/firmware-removed
-# http://svn.gnewsense.svnhopper.net/gnewsense/builder/trunk/gen-kernel
+# http://wiki.gnewsense.org/Builder gen-kernel
 
 # Thanks to Brian Brazil @ gnewsense
 
 
 # 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.33 extra=-- # up to -rc7
+kver=2.6.33 extra=0++
 
 case $1 in
 --force)
@@ -1518,7 +1517,7 @@ announce BT_MRVL_SDIO - "Marvell BT-over-SDIO driver"
 reject_firmware drivers/bluetooth/btmrvl_sdio.c
 clean_blob drivers/bluetooth/btmrvl_sdio.c
 clean_blob Documentation/btmrvl.txt
-clean_kconfig drivers/bluetooth/Kcofnig 'BT_MRVL_SDIO'
+clean_kconfig drivers/bluetooth/Kconfig 'BT_MRVL_SDIO'
 clean_mk CONFIG_BT_MRVL_SDIO drivers/bluetooth/Makefile
 
 # wimax
@@ -1528,7 +1527,7 @@ reject_firmware drivers/net/wimax/i2400m/fw.c
 clean_blob drivers/net/wimax/i2400m/sdio.c
 clean_blob drivers/net/wimax/i2400m/usb.c
 clean_blob Documentation/wimax/README.i2400m
-clean_kconfig drivers/net/wimax/i2400m/Kconfig CONFIG_WIMAX_I2400M
+clean_kconfig drivers/net/wimax/i2400m/Kconfig 'WIMAX_I2400M'
 clean_mk CONFIG_WIMAX_I2400M drivers/net/wimax/i2400m/Makefile
 
 ########
@@ -2023,10 +2022,11 @@ clean_sed '
 clean_mk CONFIG_SOUND_MSNDPIN sound/oss/Makefile
 
 announce SND_SSCAPE - "Ensoniq SoundScape driver"
+reject_firmware sound/isa/sscape.c
 clean_blob sound/isa/sscape.c
 clean_sed '
 /^config SND_SSCAPE$/, /^config / {
-  s,"\(scope\|sndscape\)\.co[d?]","/*(DEBLOBBED)*/",;
+  s,"\(scope\|sndscape\)\.co[d?]","/*(DEBLOBBED)*/",g;
 }' sound/isa/Kconfig 'removed firmware names'
 clean_kconfig sound/isa/Kconfig 'SND_SSCAPE'
 clean_mk CONFIG_SND_SSCAPE sound/isa/Makefile