Remove hack_fwmk, replace deblobbed firmware names with $(DEBLOBBED).

git-svn-id: http://www.fsfla.org/svn/fsfla/software/linux-libre/scripts@4368 559672b5-ba27-0410-b829-e8f1faed8b1b

diff --git a/deblob-2.6.27 b/deblob-2.6.27
index 4248c69e6b8ddffc683bc689c50cd2530e689873..40c53f189c5ca2009d71428e63ea903b6d4b3614 100755 (executable)
--- a/deblob-2.6.27
+++ b/deblob-2.6.27
@@ -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
@@ -196,8 +189,6 @@ done
 # Identify the tarball.
 sed -i "s,^EXTRAVERSION.*,&-libre$extra," Makefile
 
-hack_fwmk 'NONFREE_FW :='
-
 #######################
 # Removed ATM Drivers #
 #######################
@@ -733,8 +724,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