Recover fix for deblobbing of tg3.c.

[releases.git] / deblob-2.6.25

diff --git a/deblob-2.6.25 b/deblob-2.6.25
index ce472ec686182ac7f27f745e430176ea1de7782e..c44e5caa4cb1532f6d9e768d1be97700590c75b6 100755 (executable)
--- a/deblob-2.6.25
+++ b/deblob-2.6.25
@@ -1,6 +1,7 @@
 #!/bin/sh
 #
 #    Copyright (C) 2008 Jeff Moe
+#    Copyright (C) 2008 Alexandre Oliva <lxoliva@fsfla.org>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -20,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
@@ -30,6 +32,12 @@
 # Thanks to Brian Brazil @ gnewsense
 #
 
+# This version, suited for 2.6.25, 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
+# script, that knows how to do this, is present.  -lxoliva
+
 ####################
 # FOOOOO XXXXXX
 # drivers/net/tokenring/Kconfig needs as last line:
@@ -309,7 +317,7 @@ patch --no-backup-if-mismatch -p0 <<\EOF # patches/linux-2.6-tg3-clean.patch
  
 EOF
 clean_blob drivers/net/tg3.c
- 
+sed -i 's:\(\/\*(DEBLOBBED)\*\/\),:\1:' drivers/net/tg3.c 
 
 # TYPHOON - 3cr990 series Typhoon
 clean_blob drivers/net/typhoon-firmware.h