New false positives in 2.6.26.

[releases.git] / deblob-2.6.26

diff --git a/deblob-2.6.26 b/deblob-2.6.26
index 82a80a6ffd35a02a5b5300a1c4930dd00ec855cf..855dd095656efe537c02ab895a574e1ffccefb33 100755 (executable)
--- a/deblob-2.6.26
+++ b/deblob-2.6.26
@@ -32,7 +32,7 @@
 # Thanks to Brian Brazil @ gnewsense
 #
 
-# This version, suited for 2.6.25, avoids removing Free Software for
+# This version, suited for 2.6.26, avoids removing Free Software for
 # the sake of removing non-Free Software.  Drivers that currently
 # require non-Free firmware are retained, but firmware included in
 # GPLed sources is replaced with /*(DEBLOBBED)*/ if the deblob-check
@@ -63,11 +63,18 @@ fi
 
 function clean_file {
        #$1 = filename
+       if test ! -f $1; then
+               echo $1 does not exist, something is wrong >&2
+               exit 1
+       fi
        rm -v $1
 }
 
 function check_changed {
-       if cmp $1.deblob $1 > /dev/null; then
+       if test ! -f $1; then
+               echo $1 does not exist, something is wrong >&2
+               exit 1
+       elif cmp $1.deblob $1 > /dev/null; then
                echo $1 did not change, something is wrong >&2
                exit 1
        fi
@@ -77,6 +84,10 @@ function check_changed {
 function clean_blob {
        #$1 = filename
        if $have_check; then
+           if test ! -f $1; then
+               echo $1 does not exist, something is wrong >&2
+               exit 1
+           fi
            name=$1
            echo Removing blobs from $name
            set fnord "$@" -d
@@ -172,7 +183,7 @@ clean_kconfig drivers/char/drm/Kconfig 'DRM_R128'
 clean_mk CONFIG_DRM_R128 drivers/char/drm/Makefile
 
 # DRM_RADEON - ATI Radeon
-clean_blob drivers/char/drm/radeon_cp.c
+clean_blob drivers/char/drm/radeon_microcode.h
 clean_kconfig drivers/char/drm/Kconfig 'DRM_RADEON'
 clean_mk CONFIG_DRM_RADEON drivers/char/drm/Makefile
 
@@ -568,7 +579,7 @@ clean_kconfig sound/pci/Kconfig 'SND_CS46XX'
 
 # SND_KORG1212 - Korg 1212 IO
 # clean_ifdef sound/pci/korg1212/korg1212.c CONFIG_SND_KORG1212_FIRMWARE_IN_KERNEL
-clean_blob sound/pci/korg1212/korg1212-firmware.c
+clean_blob sound/pci/korg1212/korg1212-firmware.h
 
 # SND_MAESTRO3 - ESS Allegro/Maestro3
 clean_ifdef sound/pci/maestro3.c CONFIG_SND_MAESTRO3_FIRMWARE_IN_KERNEL