X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;ds=sidebyside;f=deblob-2.6.30;h=4f4da2d048a4fda7c08cfdde14cf15ff3090465a;hb=e023910cd9c5451e05eb58a65ba08785aecf0303;hp=0b4da217280e8fc577afc588c48b0ed7fbcd5a0b;hpb=ab3f05f8ec731d2c3c0ed3ec9c086c5a400bcca8;p=releases.git

diff --git a/deblob-2.6.30 b/deblob-2.6.30
index 0b4da217280e..4f4da2d048a4 100755
--- a/deblob-2.6.30
+++ b/deblob-2.6.30
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-#    Copyright (C) 2008, 2009 Alexandre Oliva <lxoliva@fsfla.org>
+#    Copyright (C) 2008, 2009, 2010 Alexandre Oliva <lxoliva@fsfla.org>
 #    Copyright (C) 2008 Jeff Moe
 #    Copyright (C) 2009 Rubén Rodríguez <ruben@gnu.org>
 #
@@ -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.30 extra=1
+kver=2.6.30 extra=2++
 
 case $1 in
 --force)
@@ -190,7 +189,7 @@ clean_sed () {
   filetest $2 || return
   sed -e "$1" "$2" > "$2".deblob || {
     die $2: failed: ${3-applied sed script $1} && return 1; }
-  check_changed $2 && echo $2: ${3-applied sed script $1} 
+  check_changed $2 && echo $2: ${3-applied sed script $1}
 }
 
 reject_firmware () {
@@ -1003,7 +1002,7 @@ clean_sed '
   /for (p = PhyUcode/i\
 		printk("%s: missing Free firmware\\n", __func__);\
 		return (STATUS_FAILURE);\
-#define PhyUcode NULL		
+#define PhyUcode NULL
 }' drivers/staging/sxg/sxg.c 'report missing Free firmware'
 clean_blob drivers/staging/sxg/sxg.c
 clean_kconfig drivers/staging/sxg/Kconfig 'SXG'
@@ -1400,7 +1399,7 @@ clean_sed '
 /^INT[	]set_eFuseLoadFromBin_Proc(/,/^}$/{
   /src = kmalloc/i\
 	printk("%s: missing Free firmware\\n", __func__);\
-	return FALSE;	
+	return FALSE;
 }' drivers/staging/rt3070/common/eeprom.c 'report missing Free firmware'
 clean_blob drivers/staging/rt3070/common/eeprom.c
 clean_sed '
@@ -1418,7 +1417,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
 
 ########
@@ -1961,6 +1960,7 @@ clean_blob Documentation/sound/alsa/ALSA-Configuration.txt
 clean_blob Documentation/sound/oss/MultiSound
 clean_blob Documentation/sound/oss/PSS
 clean_blob Documentation/sound/oss/PSS-updates
+clean_blob Documentation/sound/oss/README.OSS
 clean_file Documentation/dvb/get_dvb_firmware
 clean_file Documentation/video4linux/extract_xc3028.pl
 clean_sed s,usb8388,whatever,g drivers/base/Kconfig 'removed blob name'