Adjust to cope with git-linus.diff in 2.6.27-0.148.rc0.git2.fc10.

[releases.git] / deblob-2.6.27

diff --git a/deblob-2.6.27 b/deblob-2.6.27
index 488a552e985ee4b69c7e59144a7cba5cad5c6cf9..180f89b84e719ed359081f5916d40c7673f61ced 100755 (executable)
--- a/deblob-2.6.27
+++ b/deblob-2.6.27
@@ -1,5 +1,5 @@
 #!/bin/sh
-#
+
 #    Copyright (C) 2008 Jeff Moe
 #    Copyright (C) 2008 Alexandre Oliva <lxoliva@fsfla.org>
 #
@@ -16,44 +16,39 @@
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-#
+
+
 # deblob - remove non-free blobs from the vanilla linux kernel
-#
-# 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
-#
+
+
+# This script, suited for the kernel version named below, in kver,
+# attempts to remove only non-Free Software bits, without removing
+# Free Software that happens to be in the same file.
+
+# 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
+
+
 # See also:
 # http://wiki.debian.org/KernelFirmwareLicensing
 # svn://svn.debian.org/kernel/dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1
 # http://svn.gnewsense.svnhopper.net/gnewsense/builder/trunk/firmware/firmware-removed
 # http://svn.gnewsense.svnhopper.net/gnewsense/builder/trunk/gen-kernel
-#
+
 # Thanks to Brian Brazil @ gnewsense
-#
 
-# This version, suited for 2.6.27, 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
 
 # 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.27 extra=
 
-sed -i "s,^EXTRAVERSION.*,EXTRAVERSION = -libre$extra," Makefile
-
-####################
-# FOOOOO XXXXXX
-# drivers/net/tokenring/Kconfig needs as last line:
-# endif # TR
-# drivers/media/Kconfig needs before endmenu
-# endif # DAB
-
 check=`echo $0 | sed 's,/[^/]*$,,'`/deblob-check
 if [ ! -f $check ] ; then
-  echo "optional deblob-check missing, will remove entire files"
+  echo optional deblob-check missing, will remove entire files >&2
   have_check=false
 else
   have_check=:
@@ -162,6 +157,8 @@ for f in \
   fi
 done
 
+# Identify the tarball.
+sed -i "s,^EXTRAVERSION.*,&-libre$extra," Makefile
 
 #######################
 # Removed ATM Drivers #
@@ -172,16 +169,7 @@ clean_blob firmware/atmsar11.HEX
 
 # ATM_FORE200E_PCA
 # ATM_FORE200E_SBA - SBA-200E
-# it appears by placing these files under the GPL this company
-# now has to release the source
-
-# There's no code in this file. --lxoliva
-# clean_file drivers/atm/fore200e_firmware_copyright
-
-# There's only GPLed code in this one. --lxoliva
-# clean_file drivers/atm/fore200e_mkfirm.c
-
-clean_kconfig drivers/atm/Kconfig 'ATM_\(FORE\).*'
+clean_kconfig drivers/atm/Kconfig 'ATM_FORE.*'
 clean_mk CONFIG_ATM_FORE200E drivers/atm/Makefile
 
 clean_file drivers/atm/pca200e.data
@@ -205,7 +193,7 @@ clean_blob firmware/dsk56k/bootstrap.bin.ihex
 clean_kconfig arch/m68k/Kconfig 'ATARI_DSP56K'
 clean_mk CONFIG_ATARI_DSP56K drivers/char/Makefile
 
-# drm
+# gpu drm
 
 # DRM_MGA - Matrox g200/g400
 clean_blob drivers/gpu/drm/mga_ucode.h