Improvements for 2.6.26-git15, to avoid installing or building

deblobbed firmware files.

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

diff --git a/deblob-2.6.27 b/deblob-2.6.27
index e2bb5f011a25fd693353c4676af6e88d2f66d97e..7d4fbd8e736499bdedda7ba479fc6e135ed9a008 100755 (executable)
--- a/deblob-2.6.27
+++ b/deblob-2.6.27
@@ -98,7 +98,7 @@ function dummy_blob {
            echo $1 exists, something is wrong >&2
            exit 1
        else
-           echo "\$(obj)/$1: ; mkdir -p \$(dir \$@) && : > \$@" >> firmware/Makefile
+           hack_fwmk "NONFREE_FW += $2"
        fi
 }
 
@@ -115,6 +115,17 @@ 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
@@ -185,6 +196,8 @@ done
 # Identify the tarball.
 sed -i "s,^EXTRAVERSION.*,&-libre$extra," Makefile
 
+hack_fwmk 'NONFREE_FW :='
+
 #######################
 # Removed ATM Drivers #
 #######################
@@ -704,4 +717,8 @@ dummy_blob firmware/sb16/ima_adpcm_playback.csp
 # Just remove it.
 clean_file sound/isa/wavefront/yss225.c
 
+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