From 035b4d36596fff66efb52744c9831427eab084c2 Mon Sep 17 00:00:00 2001 From: lxoliva Date: Wed, 1 May 2013 21:01:52 +0000 Subject: [PATCH] GNU Linux-libre 3.3-gnu1 git-svn-id: http://www.fsfla.org/svn/fsfla/software/linux-libre/scripts@10366 559672b5-ba27-0410-b829-e8f1faed8b1b --- deblob-3.3 | 37 ++++++++++++++++--------------------- 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/deblob-3.3 b/deblob-3.3 index 922d35aa2f4..e41b1c7e783 100755 --- a/deblob-3.3 +++ b/deblob-3.3 @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2008-2012 Alexandre Oliva +# Copyright (C) 2008-2013 Alexandre Oliva # Copyright (C) 2008 Jeff Moe # Copyright (C) 2009 Rubén Rodríguez # @@ -48,7 +48,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=3.3 extra= +kver=3.3 extra=1 case $1 in --force) @@ -80,6 +80,7 @@ if [ ! -f $check ] ; then have_check=false else have_check=: + [ -x $check ] || check="/bin/sh $check" fi filetest () { @@ -116,7 +117,13 @@ clean_blob () { name=$1 set fnord "$@" -d shift 2 - $check "$@" -i linux-$kver $name > $name.deblob + if $check "$@" -i linux-$kver $name > $name.deblob; then + if [ ! -s $name.deblob ]; then + die got an empty file after removing blobs from $name + fi + else + die failed removing blobs from $name + fi check_changed $name && echo $name: removed blobs else clean_file $1 @@ -281,9 +288,7 @@ for f in \ firmware/isci/isci_firmware.bin.ihex \ drivers/scsi/isci/firmware/create_fw.c \ ; do - if test ! $f; then - die $f is not present, something is amiss && return - fi + filetest $f done # Identify the tarball. @@ -623,15 +628,6 @@ reject_firmware drivers/media/dvb/dvb-usb/dvb-usb-firmware.c clean_kconfig drivers/media/dvb/dvb-usb/Kconfig 'DVB_USB' clean_mk CONFIG_DVB_USB drivers/media/dvb/dvb-usb/Makefile -announce DVB_USB_AF9005 - "Afatech AF9005 DVB-T USB1.1" -clean_file drivers/media/dvb/dvb-usb/af9005-script.h -clean_sed ' -s,^ deb_info("load init script\\n");$, {\n err("Missing Free init script\\n");\n return scriptlen = ret = -EINVAL;\n ,; -' drivers/media/dvb/dvb-usb/af9005-fe.c 'report missing Free init script' -clean_blob drivers/media/dvb/dvb-usb/af9005-fe.c -clean_kconfig drivers/media/dvb/dvb-usb/Kconfig 'DVB_USB_AF9005' -clean_mk CONFIG_DVB_USB_AF9005 drivers/media/dvb/dvb-usb/Makefile - announce DVB_B2C2_FLEXCOP - "Technisat/B2C2 FlexCopII(b) and FlexCopIII adapters" reject_firmware drivers/media/dvb/b2c2/flexcop-fe-tuner.c @@ -644,6 +640,11 @@ clean_kconfig drivers/media/dvb/dvb-usb/Kconfig 'DVB_USB_A800' clean_mk CONFIG_DVB_USB_A800 drivers/media/dvb/dvb-usb/Makefile announce DVB_USB_AF9005 - "Afatech AF9005 DVB-T USB1.1 support" +clean_file drivers/media/dvb/dvb-usb/af9005-script.h +clean_sed ' +s,^ deb_info("load init script\\n");$, {\n err("Missing Free init script\\n");\n return scriptlen = ret = -EINVAL;\n ,; +' drivers/media/dvb/dvb-usb/af9005-fe.c 'report missing Free init script' +clean_blob drivers/media/dvb/dvb-usb/af9005-fe.c clean_blob drivers/media/dvb/dvb-usb/af9005.c clean_kconfig drivers/media/dvb/dvb-usb/Kconfig 'DVB_USB_AF9005' clean_mk CONFIG_DVB_USB_AF9005 drivers/media/dvb/dvb-usb/Makefile @@ -1598,12 +1599,6 @@ clean_blob drivers/net/wireless/ath/ath6kl/sdio.c clean_kconfig drivers/net/wireless/ath/ath6kl/Kconfig 'ATH6KL' clean_mk CONFIG_ATH6KL drivers/net/wireless/ath/ath6kl/Makefile -announce ATH9K_HTC - "Atheros HTC based wireless cards support" -reject_firmware drivers/net/wireless/ath/ath9k/hif_usb.c -clean_blob drivers/net/wireless/ath/ath9k/hif_usb.c -clean_kconfig drivers/net/wireless/ath/ath9k/Kconfig 'ATH9K_HTC' -clean_mk CONFIG_ATH9K_HTC drivers/net/wireless/ath/ath9k/Makefile - announce PRISM2_USB - "Prism2.5/3 USB driver" reject_firmware drivers/staging/wlan-ng/prism2fw.c clean_blob drivers/staging/wlan-ng/prism2fw.c -- 2.31.1