Promote ../fedora/current/*/scripts/deblob.sh to deblob-main.

[releases.git] / deblob-2.6.25

diff --git a/deblob-2.6.25 b/deblob-2.6.25
index f16ebb12a557632aa41e4d258e550ac79e0d40cd..2f3457d57043799b7f2d70ca49e77f3469e1d774 100755 (executable)
--- a/deblob-2.6.25
+++ b/deblob-2.6.25
@@ -21,6 +21,7 @@
 #
 # http://www.blagblagblag.org/pub/BLAG/linux/kernel/v2.6
 #  ftp://ftp.blagblagblag.org/pub/BLAG/linux/kernel/v2.6
+# http://www.fsfla.org/svn/fsfla/software/linux-libre
 #
 # See also:
 # http://wiki.debian.org/KernelFirmwareLicensing
@@ -37,6 +38,12 @@
 # GPLed sources is replaced with /*(DEBLOBBED)*/ if the deblob-check
 # script, that knows how to do this, is present.  -lxoliva
 
+# 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.25 extra=
+
+sed -i "s,^EXTRAVERSION.*,EXTRAVERSION = -libre$extra," Makefile
+
 ####################
 # FOOOOO XXXXXX
 # drivers/net/tokenring/Kconfig needs as last line:
@@ -51,11 +58,15 @@ function clean_file {
        rm -v $1
 }
 
+check=`echo $0 | sed 's,/[^/]*$,,'`/deblob-check
 function clean_blob {
        #$1 = filename
-       if test -f $0-check; then
-           $0-check -d $1 > $1.deblob
-           mv $1.deblob $1
+       if test -f $check; then
+           name=$1
+           set fnord "$@" -d
+           shift 2
+           $check "$@" $name > $name.deblob
+           mv $name.deblob $name
        else
            clean_file $1
        fi
@@ -315,8 +326,8 @@ patch --no-backup-if-mismatch -p0 <<\EOF # patches/linux-2.6-tg3-clean.patch
  
  
 EOF
-clean_blob drivers/net/tg3.c
- 
+clean_blob drivers/net/tg3.c -s 9
+sed -i 's:\(\/\*(DEBLOBBED)\*\/\),:\1:' drivers/net/tg3.c 
 
 # TYPHOON - 3cr990 series Typhoon
 clean_blob drivers/net/typhoon-firmware.h