X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=deblob-2.6.21;h=1ce3bd3e54b68962c73e1ffa057ad952f67041ec;hb=d7f8ffd6945e762f59be5031698883772005cbd3;hp=d41d4872ec45969c4838282a283fdc841556e7dc;hpb=dfa4111cec75c68a1e64ccba7d2eed586b151881;p=releases.git

diff --git a/deblob-2.6.21 b/deblob-2.6.21
index d41d4872ec45..1ce3bd3e54b6 100755
--- a/deblob-2.6.21
+++ b/deblob-2.6.21
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #    Copyright (C) 2008 Jeff Moe
-#    Copyright (C) 2008 Alexandre Oliva <lxoliva@fsfla.org>
+#    Copyright (C) 2008, 2009 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
@@ -90,7 +90,7 @@ clean_blob () {
 	    echo Removing blobs from $name
 	    set fnord "$@" -d
 	    shift 2
-	    $check "$@" $name > $name.deblob
+	    $check "$@" -i linux-$kver $name > $name.deblob
 	    check_changed $name
 	else
 	    clean_file $1
@@ -324,8 +324,12 @@ clean_kconfig drivers/net/Kconfig 'ACENIC'
 clean_mk CONFIG_ACENIC drivers/net/Makefile
 
 # ADAPTEC_STARFIRE - Adaptec Starfire/DuraLAN support
-# This adds restrictions on top of GPLv2, but after deblobbing,
-# nothing copyrightable remains.
+
+# This file requires prior acceptance of the GPL before you can even
+# run the code in it.  It's not clear whether this is a further
+# requirement that would make the distribution incompatible with the
+# GPL, but since nothing remains after we remove the blob, it's
+# irrelevant whether the explicit acceptance would be a problem.
 clean_blob drivers/net/starfire_firmware.h
 clean_kconfig drivers/net/Kconfig 'ADAPTEC_STARFIRE'
 clean_mk CONFIG_ADAPTEC_STARFIRE drivers/net/Makefile
@@ -379,12 +383,12 @@ patch --no-backup-if-mismatch --batch -p0 <<\EOF || \
 - *	data in hexadecimal or equivalent format, provided this copyright
 - *	notice is accompanying it.
   */
- 
- 
+
+
 EOF
 clean_blob drivers/net/tg3.c -s 9
 if $have_check; then
-  sed -i 's:\(\/\*(DEBLOBBED)\*\/\),:\1:' drivers/net/tg3.c 
+  sed -i 's:\(\/\*(DEBLOBBED)\*\/\),:\1:' drivers/net/tg3.c
 else
   clean_kconfig drivers/net/Kconfig 'TIGON3'
   clean_mk CONFIG_TIGON3 drivers/net/Makefile