X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=deblob-2.6.27;h=eba13661c2f2615f7333a5ae29906cf6649c7051;hb=14d308052634be4d218a4c517bb32ac54b89213d;hp=4248c69e6b8ddffc683bc689c50cd2530e689873;hpb=97e53bb1061fc216a03a3862ca8ba64341c532a2;p=releases.git

diff --git a/deblob-2.6.27 b/deblob-2.6.27
index 4248c69e6b8d..eba13661c2f2 100755
--- a/deblob-2.6.27
+++ b/deblob-2.6.27
@@ -44,7 +44,7 @@
 
 # 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=
+kver=2.6.27 extra=++
 
 case $1 in
 --force) die () { echo ERROR: "$@": ignored >&2; }; shift;;
@@ -98,9 +98,13 @@ function dummy_blob {
 	if test -f $1; then
 	    echo $1 exists, something is wrong >&2
 	    exit 1
-	else
-	    hack_fwmk "NONFREE_FW += $1"
+	elif test ! -f firmware/Makefile; then
+	    echo firmware/Makefile does not exist, something is wrong >&2
+	    exit 1
 	fi
+
+	sed -i "s,`echo $1 | sed s,^firmware/,,`,\$(DEBLOBBED),g" \
+	  firmware/Makefile
 }
 
 function clean_fw {
@@ -116,17 +120,6 @@ function clean_fw {
 	dummy_blob $2
 }
 
-function hack_fwmk {
-	if test ! -f firmware/Makefile; then
-	    echo firmware/Makefile does not exist, something is wrong >&2
-	    exit 1
-	fi
-
-	sed -i "/^[ 	]*fw-shipped-all[ 	]*:=[ 	]*/i\
-$1
-" firmware/Makefile
-}
-
 function clean_kconfig {
         #$1 = filename $2 = things to remove
         echo Marking config $2 as depending on NONFREE in $1
@@ -144,8 +137,7 @@ 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
 }
 
@@ -196,8 +188,6 @@ done
 # Identify the tarball.
 sed -i "s,^EXTRAVERSION.*,&-libre$extra," Makefile
 
-hack_fwmk 'NONFREE_FW :='
-
 #######################
 # Removed ATM Drivers #
 #######################
@@ -395,7 +385,9 @@ clean_kconfig drivers/net/Kconfig 'TEHUTI'
 clean_mk CONFIG_TEHUTI 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 @@
@@ -733,8 +725,4 @@ dummy_blob firmware/sb16/ima_adpcm_playback.csp
 clean_file sound/isa/wavefront/yss225.c
 clean_kconfig sound/isa/Kconfig 'SND_WAVEFRONT_FIRMWARE_IN_KERNEL'
 
-hack_fwmk 'fw-shipped-y := $(filter-out $(NONFREE_FW), $(fw-shipped-y))'
-hack_fwmk 'fw-shipped-m := $(filter-out $(NONFREE_FW), $(fw-shipped-m))'
-hack_fwmk 'fw-shipped-  := $(filter-out $(NONFREE_FW), $(fw-shipped-) )'
-
 exit 0