X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=deblob-2.6.23;h=5fa3ba877570c94a911381f513c02fd9c12e82f6;hb=dfa4111cec75c68a1e64ccba7d2eed586b151881;hp=d547fcd4ad593260b59b101a0f541f0ca17c2493;hpb=e9af377f4dd06d66ec2dbadea085b0abaaeea0be;p=releases.git

diff --git a/deblob-2.6.23 b/deblob-2.6.23
index d547fcd4ad59..5fa3ba877570 100755
--- a/deblob-2.6.23
+++ b/deblob-2.6.23
@@ -44,13 +44,15 @@
 
 # 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.23 extra=3
+kver=2.6.23 extra=3++
 
-sed -i "s,^EXTRAVERSION.*,EXTRAVERSION = -libre$extra," Makefile
+case $1 in
+--force) die () { echo ERROR: "$@": ignored >&2; }; shift;;
+*) die () { echo "$@" >&2; exit 1; };;
+esac
 
-if unifdef /dev/null; then :; else
-    echo unifdef is required >&2
-    exit 1
+if unifdef -Utest /dev/null; then :; else
+    die unifdef is required
 fi
 
 check=`echo $0 | sed 's,/[^/]*$,,'`/deblob-check
@@ -61,32 +63,28 @@ else
   have_check=:
 fi
 
-function clean_file {
+clean_file () {
 	#$1 = filename
 	if test ! -f $1; then
-		echo $1 does not exist, something is wrong >&2
-		exit 1
+		die $1 does not exist, something is wrong
 	fi
 	rm -v $1
 }
 
-function check_changed {
+check_changed () {
 	if test ! -f $1; then
-		echo $1 does not exist, something is wrong >&2
-		exit 1
+		die $1 does not exist, something is wrong
 	elif cmp $1.deblob $1 > /dev/null; then
-		echo $1 did not change, something is wrong >&2
-		exit 1
+		die $1 did not change, something is wrong
 	fi
 	mv $1.deblob $1
 }
 
-function clean_blob {
+clean_blob () {
 	#$1 = filename
 	if $have_check; then
 	    if test ! -f $1; then
-		echo $1 does not exist, something is wrong >&2
-		exit 1
+		die $1 does not exist, something is wrong
 	    fi
 	    name=$1
 	    echo Removing blobs from $name
@@ -99,7 +97,7 @@ function clean_blob {
 	fi
 }
 
-function clean_kconfig {
+clean_kconfig () {
         #$1 = filename $2 = things to remove
         echo Marking config $2 as depending on NONFREE in $1
 	sed "/^config \\($2\\)\$/{p;i\
@@ -108,7 +106,7 @@ d;}" $1 > $1.deblob
 	check_changed $1
 }
 
-function clean_mk {
+clean_mk () {
 	#$1 = config $2 = Makefile name
 	# We don't clean up Makefiles any more --lxoliva
 	# sed -i "/\\($1\\)/d" $2
@@ -116,15 +114,14 @@ function clean_mk {
 	if sed -n "/\\($1\\)/p" $2 | grep . > /dev/null; then
 	    :
 	else
-	    echo $2 does not contain matches for $1
-	    exit 1
+	    die $2 does not contain matches for $1
 	fi
 }
 
-function clean_ifdef {
+clean_ifdef () {
 	#$1 = filename $2 = macro to -U
 	echo unifdefing $1 with -U$2
-	unifdef $1 -U$2 > $1.deblob
+	unifdef -U$2 $1 > $1.deblob
 	check_changed $1
 }
 
@@ -165,11 +162,12 @@ for f in \
     sound/pci/cs46xx/imgs/cwcdma.asp \
 ; do
   if test ! $f; then
-    echo $f is not present, something is amiss >&2
-    exit 1
+    die $f is not present, something is amiss
   fi
 done
 
+# Identify the tarball.
+sed -i "s,^EXTRAVERSION.*,&-libre$extra," Makefile
 
 #######################
 # Removed ATM Drivers #
@@ -368,7 +366,9 @@ clean_kconfig drivers/net/Kconfig 'MYRI_SBUS'
 clean_mk CONFIG_MYRI_SBUS drivers/net/Makefile
 
 # TIGON3 - Broadcom Tigon3
-patch --no-backup-if-mismatch -p0 <<\EOF # patches/linux-2.6-tg3-clean.patch
+patch --no-backup-if-mismatch --batch -p0 <<\EOF || \
+  die failed to remove license comments from drivers/net/tg3.c \
+  # patches/linux-2.6-tg3-clean.patch
 --- drivers/net/tg3.c
 +++ drivers/net/tg3.c
 @@ -5,14 +5,6 @@
@@ -608,24 +608,27 @@ 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_blob sound/pci/korg1212/korg1212-firmware.h
+clean_ifdef sound/pci/korg1212/korg1212.c CONFIG_SND_KORG1212_FIRMWARE_IN_KERNEL
+clean_kconfig sound/pci/Kconfig 'SND_KORG1212_FIRMWARE_IN_KERNEL'
 
 # SND_MAESTRO3 - ESS Allegro/Maestro3
 clean_ifdef sound/pci/maestro3.c CONFIG_SND_MAESTRO3_FIRMWARE_IN_KERNEL
+clean_kconfig sound/pci/Kconfig 'SND_MAESTRO3_FIRMWARE_IN_KERNEL'
 
 # SND_YMFPCI - Yamaha YMF724/740/744/754
 clean_blob sound/pci/ymfpci/ymfpci_image.h
 clean_ifdef sound/pci/ymfpci/ymfpci_main.c CONFIG_SND_YMFPCI_FIRMWARE_IN_KERNEL
+clean_kconfig sound/pci/Kconfig 'SND_YMFPCI_FIRMWARE_IN_KERNEL'
 
 # SND_SB16_CSP_FIRMWARE_IN_KERNEL - SB16 Advanced Signal Processor
 clean_blob sound/isa/sb/sb16_csp_codecs.h
-clean_kconfig sound/isa/Kconfig SND_SB16_CSP_FIRMWARE_IN_KERNEL
+clean_kconfig sound/isa/Kconfig 'SND_SB16_CSP_FIRMWARE_IN_KERNEL'
 
 # SND_WAVEFRONT_FIRMWARE_IN_KERNEL
 # Most of this file is not matched by deblob-check because of WAIT_IDLE.
 # Just remove it.
 clean_file sound/isa/wavefront/yss225.c
-clean_kconfig sound/isa/Kconfig SND_WAVEFRONT_FIRMWARE_IN_KERNEL
+clean_kconfig sound/isa/Kconfig 'SND_WAVEFRONT_FIRMWARE_IN_KERNEL'
 
 exit 0