X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=deblob-2.6.27;h=67e5a1b1e5d2b672a329353324a48f4ca0c4f5ab;hb=cef72981d485fed3198494e45de6929d4144bf15;hp=930ccb9c16bf178162bdd8ef8b370607840b66b2;hpb=dfa4111cec75c68a1e64ccba7d2eed586b151881;p=releases.git

diff --git a/deblob-2.6.27 b/deblob-2.6.27
index 930ccb9c16bf..67e5a1b1e5d2 100755
--- a/deblob-2.6.27
+++ b/deblob-2.6.27
@@ -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
@@ -86,7 +86,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
@@ -194,15 +194,14 @@ sed -i "s,^EXTRAVERSION.*,&-libre$extra," Makefile
 
 # ATM_AMBASSADOR -  Madge Ambassador (Collage PCI 155 Server)
 clean_fw firmware/atmsar11.HEX firmware/atmsar11.fw
+clean_kconfig drivers/atm/Kconfig 'ATM_AMBASSADOR'
+clean_mk CONFIG_ATM_AMBASSADOR drivers/atm/Makefile
 
 # ATM_FORE200E_PCA
 # ATM_FORE200E_SBA - SBA-200E
 clean_kconfig drivers/atm/Kconfig 'ATM_FORE.*'
 clean_mk CONFIG_ATM_FORE200E drivers/atm/Makefile
 
-clean_kconfig drivers/atm/Kconfig 'ATM_AMBASSADOR'
-clean_mk CONFIG_ATM_AMBASSADOR drivers/atm/Makefile
-
 
 ########################
 # Removed char Drivers #
@@ -344,8 +343,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
@@ -482,10 +485,6 @@ clean_mk CONFIG_USB_KAWETH drivers/net/usb/Makefile
 
 # wireless
 
-clean_blob drivers/net/wireless/rtl8187_dev.c
-# clean_kconfig drivers/net/wireless/Kconfig 'RTL8187'
-# clean_mk CONFIG_RTL8187 drivers/net/wireless/Makefile
-
 
 ########################
 # Removed s390 Drivers #