From: lxoliva Date: Wed, 16 Jul 2008 10:12:29 +0000 (+0000) Subject: Consolidate comments. Fix test for unifdef. X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=e9af377f4dd06d66ec2dbadea085b0abaaeea0be;p=releases.git Consolidate comments. Fix test for unifdef. git-svn-id: http://www.fsfla.org/svn/fsfla/software/linux-libre/scripts@3928 559672b5-ba27-0410-b829-e8f1faed8b1b --- diff --git a/deblob-2.6.23 b/deblob-2.6.23 index 959d2ad5896..d547fcd4ad5 100755 --- a/deblob-2.6.23 +++ b/deblob-2.6.23 @@ -1,5 +1,5 @@ #!/bin/sh -# + # Copyright (C) 2008 Jeff Moe # Copyright (C) 2008 Alexandre Oliva # @@ -16,27 +16,31 @@ # 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.23, 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. @@ -44,18 +48,14 @@ kver=2.6.23 extra=3 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 - -if [ ! -f `which unifdef` ] ; then echo "requires unifdef" ; exit ; fi +if unifdef /dev/null; then :; else + echo unifdef is required >&2 + exit 1 +fi 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=: @@ -180,16 +180,7 @@ clean_blob drivers/atm/atmsar11.data # 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 @@ -213,7 +204,7 @@ clean_blob drivers/char/dsp56k.c 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/char/drm/mga_ucode.h diff --git a/deblob-2.6.24 b/deblob-2.6.24 index 45708219596..43f4e7e807f 100755 --- a/deblob-2.6.24 +++ b/deblob-2.6.24 @@ -1,5 +1,5 @@ #!/bin/sh -# + # Copyright (C) 2008 Jeff Moe # Copyright (C) 2008 Alexandre Oliva # @@ -16,27 +16,31 @@ # 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.24, 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. @@ -44,18 +48,14 @@ kver=2.6.24 extra=3 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 - -if [ ! -f `which unifdef` ] ; then echo "requires unifdef" ; exit ; fi +if unifdef /dev/null; then :; else + echo unifdef is required >&2 + exit 1 +fi 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=: @@ -180,16 +180,7 @@ clean_blob drivers/atm/atmsar11.data # 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 @@ -213,7 +204,7 @@ clean_blob drivers/char/dsp56k.c 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/char/drm/mga_ucode.h diff --git a/deblob-2.6.25 b/deblob-2.6.25 index 451d53c3d45..ecaf58f5ef0 100755 --- a/deblob-2.6.25 +++ b/deblob-2.6.25 @@ -1,5 +1,5 @@ #!/bin/sh -# + # Copyright (C) 2008 Jeff Moe # Copyright (C) 2008 Alexandre Oliva # @@ -16,27 +16,31 @@ # 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.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 # For each kver release, start extra with an empty string, then count # from 1 if changes are needed that require rebuilding the tarball. @@ -44,18 +48,14 @@ kver=2.6.25 extra=3 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 - -if [ ! -f `which unifdef` ] ; then echo "requires unifdef" ; exit ; fi +if unifdef /dev/null; then :; else + echo unifdef is required >&2 + exit 1 +fi 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=: @@ -180,16 +180,7 @@ clean_blob drivers/atm/atmsar11.data # 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 @@ -213,7 +204,7 @@ clean_blob drivers/char/dsp56k.c 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/char/drm/mga_ucode.h diff --git a/deblob-2.6.26 b/deblob-2.6.26 index 5954c510a12..1322df09bf4 100755 --- a/deblob-2.6.26 +++ b/deblob-2.6.26 @@ -1,5 +1,5 @@ #!/bin/sh -# + # Copyright (C) 2008 Jeff Moe # Copyright (C) 2008 Alexandre Oliva # @@ -16,27 +16,31 @@ # 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.26, 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. @@ -44,18 +48,14 @@ kver=2.6.26 extra=1 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 - -if [ ! -f `which unifdef` ] ; then echo "requires unifdef" ; exit ; fi +if unifdef /dev/null; then :; else + echo unifdef is required >&2 + exit 1 +fi 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=: @@ -180,16 +180,7 @@ clean_blob drivers/atm/atmsar11.data # 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 @@ -213,7 +204,7 @@ clean_blob drivers/char/dsp56k.c 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/char/drm/mga_ucode.h @@ -621,7 +612,7 @@ clean_kconfig sound/pci/Kconfig 'SND_CS46XX' # sed -i '/cs46xx\/ \\/d' sound/pci/Makefile # SND_KORG1212 - Korg 1212 IO -# clean_ifdef sound/pci/korg1212/korg1212.c CONFIG_SND_KORG1212_FIRMWARE_IN_KERNEL +clean_ifdef sound/pci/korg1212/korg1212.c CONFIG_SND_KORG1212_FIRMWARE_IN_KERNEL clean_blob sound/pci/korg1212/korg1212-firmware.h # SND_MAESTRO3 - ESS Allegro/Maestro3 diff --git a/deblob-2.6.27 b/deblob-2.6.27 index 488a552e985..3650d12160c 100755 --- 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 # @@ -16,27 +16,31 @@ # 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. @@ -44,16 +48,9 @@ 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=: @@ -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