X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=deblob-2.6.27;h=eba13661c2f2615f7333a5ae29906cf6649c7051;hb=14d308052634be4d218a4c517bb32ac54b89213d;hp=31fb4bd77ee0cd0f591ece7e103feb8d9984d9c0;hpb=34e00f2dbb6cb7d8999e4ca8281273773e7e2821;p=releases.git

diff --git a/deblob-2.6.27 b/deblob-2.6.27
index 31fb4bd77ee0..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 += $2"
+	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 {
@@ -112,21 +116,10 @@ function clean_fw {
 		echo $2 exists, something is wrong >&2
 		exit 1
 	fi
-	clean_blob $1
+	clean_blob $1 -s 4
 	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 #
 #######################
@@ -210,9 +200,6 @@ clean_fw firmware/atmsar11.HEX firmware/atmsar11.fw
 clean_kconfig drivers/atm/Kconfig 'ATM_FORE.*'
 clean_mk CONFIG_ATM_FORE200E drivers/atm/Makefile
 
-clean_file drivers/atm/pca200e.data
-clean_file drivers/atm/pca200e_ecd.data
-clean_file drivers/atm/sba200e_ecd.data
 clean_kconfig drivers/atm/Kconfig 'ATM_AMBASSADOR'
 clean_mk CONFIG_ATM_AMBASSADOR drivers/atm/Makefile
 
@@ -230,17 +217,17 @@ clean_mk CONFIG_COMPUTONE drivers/char/Makefile
 # gpu drm
 
 # DRM_MGA - Matrox g200/g400
-clean_blob drivers/gpu/drm/mga_ucode.h
+clean_blob drivers/gpu/drm/mga/mga_ucode.h
 clean_kconfig drivers/gpu/drm/Kconfig 'DRM_MGA'
 clean_mk CONFIG_DRM_MGA drivers/gpu/drm/Makefile
 
 # DRM_R128 - ATI Rage 128
-clean_blob drivers/gpu/drm/r128_cce.c
+clean_blob drivers/gpu/drm/r128/r128_cce.c
 clean_kconfig drivers/gpu/drm/Kconfig 'DRM_R128'
 clean_mk CONFIG_DRM_R128 drivers/gpu/drm/Makefile
 
 # DRM_RADEON - ATI Radeon
-clean_blob drivers/gpu/drm/radeon_microcode.h
+clean_blob drivers/gpu/drm/radeon/radeon_microcode.h
 clean_kconfig drivers/gpu/drm/Kconfig 'DRM_RADEON'
 clean_mk CONFIG_DRM_RADEON drivers/gpu/drm/Makefile
 
@@ -393,12 +380,14 @@ clean_kconfig drivers/net/Kconfig 'MYRI_SBUS'
 clean_mk CONFIG_MYRI_SBUS drivers/net/Makefile
 
 # TEHUTI - Tehuti Networks 10G Ethernet
-clean_blob drivers/net/tehuti_fw.h
+clean_blob drivers/net/tehuti_fw.h -s 4
 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 @@
@@ -513,16 +502,16 @@ clean_mk CONFIG_QETH drivers/s390/net/Makefile
 #####################
 
 # SH_AP325RXA - Renesas AP-325RXA board
-clean_blob arch/sh/boards/renesas/ap325rxa/setup.c
-clean_kconfig arch/sh/Kconfig 'SH_AP325RXA'
-clean_mk CONFIG_SH_AP325RXA arch/sh/boards/renesas/Makefile
+clean_blob arch/sh/boards/board-ap325rxa.c
+clean_kconfig arch/sh/boards/Kconfig 'SH_AP325RXA'
+clean_mk CONFIG_SH_AP325RXA arch/sh/boards/Makefile
 
 # SH_MIGOR - Reneasas Migo-R
-clean_blob arch/sh/boards/renesas/migor/lcd_qvga.c -s 16
-clean_blob arch/sh/boards/renesas/migor/setup.c
-clean_kconfig arch/sh/boards/renesas/Kconfig 'SH_MIGOR'
-clean_kconfig arch/sh/boards/renesas/migor/Kconfig 'SH_MIGOR_QVGA'
-clean_mk CONFIG_MIGOR_QVGA arch/sh/boards/renesas/Makefile
+clean_blob arch/sh/boards/mach-migor/lcd_qvga.c -s 16
+clean_blob arch/sh/boards/mach-migor/setup.c
+clean_kconfig arch/sh/boards/Kconfig 'SH_MIGOR'
+clean_kconfig arch/sh/boards/mach-migor/Kconfig 'SH_MIGOR_QVGA'
+clean_mk CONFIG_SH_MIGOR_QVGA arch/sh/boards/mach-migor/Makefile
 
 
 ########################
@@ -736,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