make-linux: Fixed firmware deblobbing issue

helpers/DATA/linux/deblob-4.4

@@ -1393,6 +1393,9 @@ drop_fw_file firmware/bnx2/bnx2-rv2p-09-6.0.17.fw.ihex firmware/bnx2/bnx2-rv2p-0
 drop_fw_file firmware/bnx2/bnx2-rv2p-09ax-6.0.17.fw.ihex firmware/bnx2/bnx2-rv2p-09ax-6.0.17.fw
 drop_fw_file firmware/bnx2/bnx2-mips-06-6.2.1.fw.ihex firmware/bnx2/bnx2-mips-06-6.2.1.fw
 drop_fw_file firmware/bnx2/bnx2-rv2p-06-6.0.15.fw.ihex firmware/bnx2/bnx2-rv2p-06-6.0.15.fw
+# Trisquel extras
+drop_fw_file firmware/bnx2/bnx2-mips-09-6.2.1b.fw.ihex firmware/bnx2/bnx2-mips-09-6.2.1b.fw.ihex
+drop_fw_file firmware/bnx2/bnx2-mips-06-6.2.3.fw.ihex firmware/bnx2/bnx2-mips-06-6.2.3.fw.ihex
 reject_firmware drivers/net/ethernet/broadcom/bnx2.c
 clean_blob drivers/net/ethernet/broadcom/bnx2.c
 clean_kconfig drivers/net/ethernet/broadcom/Kconfig BNX2
@@ -1402,6 +1405,10 @@ announce BNX2X - "Broadcom NetXtremeII 10Gb support"
 drop_fw_file firmware/bnx2x/bnx2x-e1-6.2.9.0.fw.ihex firmware/bnx2x/bnx2x-e1-6.2.9.0.fw
 drop_fw_file firmware/bnx2x/bnx2x-e1h-6.2.9.0.fw.ihex firmware/bnx2x/bnx2x-e1h-6.2.9.0.fw
 drop_fw_file firmware/bnx2x/bnx2x-e2-6.2.9.0.fw.ihex firmware/bnx2x/bnx2x-e2-6.2.9.0.fw
+# Trisquel extras
+drop_fw_file firmware/bnx2x/bnx2x-e2-7.12.30.0.fw.ihex firmware/bnx2x/bnx2x-e2-7.12.30.0.fw.ihex
+drop_fw_file firmware/bnx2x/bnx2x-e1h-7.12.30.0.fw.ihex firmware/bnx2x/bnx2x-e1h-7.12.30.0.fw.ihex
+drop_fw_file firmware/bnx2x/bnx2x-e1-7.12.30.0.fw.ihex firmware/bnx2x/bnx2x-e1-7.12.30.0.fw.ihex
 reject_firmware drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
 clean_sed '
 /^#include "bnx2x_init\.h"/,/^$/{

helpers/make-linux

@@ -35,18 +35,13 @@ for FILE in $PRESERVE; do
 done
 
 sh $DATA/deblob-4.4 --force
-
-# Extra firmware deblobbing
-for fw in $(find firmware/|grep -i hex$ |grep -v -e dsp56k/bootstrap.bin.ihex -e keyspan_pda)
-do
- grep -q DEBLOBBED $fw || echo ':/*(DEBLOBBED)*/' > $fw
-done
+sed 's/bnx2.*fw/$(DEBLOBBED)/' -i firmware/Makefile
 
 cp /tmp/preserve/* . -a
 
 # Remove ZFS
 rm zfs spl debian/scripts/misc/update-zfs.sh -rf
-sed '/zfs/d; /spl/d' -i debian.master/reconstruct
+#sed '/zfs/d; /spl/d' -i debian.master/reconstruct
 /bin/sed 's/spl-dkms, zfs-dkms//' -i debian/control debian.master/control.d/vars.generic debian.master/control.d/vars.*
 /bin/sed  '/zfs/d' -i debian.master/rules.d/* debian.master/d-i/modules/fs-core-modules debian.master/control.d/generic.inclusion-list debian.master/abi/*/*/*.modules debian/rules debian.master/control.d/vars.*
 /bin/sed '/^define build_zfs/,/^endef/d; /^define install_zfs/,/^endef/d; /zfs/d' -i debian/rules.d/2-binary-arch.mk

helpers/make-linux-meta

 #!/bin/sh
 #
-#    Copyright (C) 2016  Ruben Rodriguez <ruben@trisquel.info>
+#    Copyright (C) 2008-2016  Ruben Rodriguez <ruben@trisquel.info>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -23,8 +23,10 @@ VERSION=1
 rm ./debian/control.d/signed-generic
 
 sed 's/, linux-firmware//' -i debian/control ./debian/control.d/generic
+sed 's/Ubuntu/upstream/' -i debian/control
 sed 's/Linux/Linux-libre/g' -i debian/control ./debian/control.d/generic
 sed '/signed/,/^$/ d' -i debian/control
+sed '/Package.*powerpc/,/^$/ d' -i debian/control
 
 changelog "Removed linux-firmware dependency, renamed release for Trisquel"