X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=deblob-2.6.31;h=10f95c9904a13ba8cd763e7499db49529493df21;hb=94e29a3619f4e5bbfec010f8b38eb56161deee0b;hp=3426ac11eec95748a481a3b0d5bc711976a87cce;hpb=bff2ad30a345e2797d7498452c552fc7ec8b271c;p=releases.git diff --git a/deblob-2.6.31 b/deblob-2.6.31 index 3426ac11eec9..10f95c9904a1 100755 --- a/deblob-2.6.31 +++ b/deblob-2.6.31 @@ -1,7 +1,8 @@ #!/bin/sh -# Copyright (C) 2008, 2009 Alexandre Oliva +# Copyright (C) 2008, 2009, 2010 Alexandre Oliva # Copyright (C) 2008 Jeff Moe +# Copyright (C) 2009 Rubén Rodríguez # # 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 @@ -44,16 +45,26 @@ # 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.31 extra=1 - -fatal () { - echo "$@" - exit 1 -} +kver=2.6.31 extra=3 case $1 in ---force) die () { echo ERROR: "$@": ignored >&2; }; forced=:; shift;; -*) die () { fatal "$@"; }; forced=false;; +--force) + echo "WARNING: Using the force, ignored errors will be" >&2 + die () { + echo ERROR: "$@" >&2 + errors=: + } + forced=: errors=false + shift + ;; +*) + die () { + echo ERROR: "$@" >&2 + echo Use --force to ignore + exit 1 + } + forced=false errors=false + ;; esac check=`echo "$0" | sed 's,[^/]*$,,;s,^$,.,;s,/*$,,'`/deblob-check @@ -68,129 +79,132 @@ else have_check=: fi +filetest () { + if [ ! -f $1 ]; then + die $1 does not exist, something is wrong && return 1 + fi +} + announce () { - echo - echo "$@" + echo + echo "$@" } clean_file () { - #$1 = filename - if test ! -f $1; then - die $1 does not exist, something is wrong - fi - rm $1 - echo $1: removed + #$1 = filename + filetest $1 || return + rm $1 + echo $1: removed } check_changed () { - if test ! -f $1; then - die $1 does not exist, something is wrong - elif cmp $1.deblob $1 > /dev/null; then - die $1 did not change, something is wrong - fi - mv $1.deblob $1 + #$1 = filename + if cmp $1.deblob $1 > /dev/null; then + rm $1.deblob + die $1 did not change, something is wrong && return 1 + fi + mv $1.deblob $1 } clean_blob () { - #$1 = filename - if $have_check; then - if test ! -f $1; then - die $1 does not exist, something is wrong - fi - name=$1 - set fnord "$@" -d - shift 2 - $check "$@" -i linux-$kver $name > $name.deblob - echo $name: removed blobs - check_changed $name - else - clean_file $1 - fi + #$1 = filename + filetest $1 || return + if $have_check; then + name=$1 + set fnord "$@" -d + shift 2 + $check "$@" -i linux-$kver $name > $name.deblob + check_changed $name && echo $name: removed blobs + else + clean_file $1 + fi } dummy_blob () { - #$1 = filename - if test -f $1; then - die $1 exists, something is wrong - elif test ! -f firmware/Makefile; then - die firmware/Makefile does not exist, something is wrong - fi - - clean_sed "s,`echo $1 | sed s,^firmware/,,`,\$(DEBLOBBED),g" \ - firmware/Makefile "dropped $1" + #$1 = filename + if test -f $1; then + die $1 exists, something is wrong && return + elif test ! -f firmware/Makefile; then + die firmware/Makefile does not exist, something is wrong && return + fi + + clean_sed "s,`echo $1 | sed s,^firmware/,,`,\$(DEBLOBBED),g" \ + firmware/Makefile "dropped $1" } clean_fw () { - #$1 = firmware text input, $2 = firmware output - if test ! -f $1; then - die $1 does not exist, something is wrong - elif test -f $2; then - die $2 exists, something is wrong - fi - clean_blob $1 -s 4 - dummy_blob $2 + #$1 = firmware text input, $2 = firmware output + filetest $1 || return + if test -f $2; then + die $2 exists, something is wrong && return + fi + clean_blob $1 -s 4 + dummy_blob $2 } drop_fw_file () { - #$1 = firmware text input, $2 = firmware output - if test ! -f $1; then - die $1 does not exist, something is wrong - elif test -f $2; then - die $2 exists, something is wrong - fi - clean_file $1 - dummy_blob $2 + #$1 = firmware text input, $2 = firmware output + filetest $1 || return + if test -f $2; then + die $2 exists, something is wrong && return + fi + clean_file $1 + dummy_blob $2 } clean_kconfig () { - #$1 = filename $2 = things to remove - case $1 in - -f) - shift - ;; - *) - if $have_check; then - return - fi - ;; - esac - sed "/^config \\($2\\)\$/{p;i\ + #$1 = filename $2 = things to remove + case $1 in + -f) + shift + ;; + *) + if $have_check; then + return + fi + ;; + esac + filetest $1 || return + sed "/^config \\($2\\)\$/{p;i\ depends on NONFREE d;}" $1 > $1.deblob - echo $1: marked config $2 as depending on NONFREE - check_changed $1 + check_changed $1 && echo $1: marked config $2 as depending on NONFREE } clean_mk () { - #$1 = config $2 = Makefile name - # We don't clean up Makefiles any more --lxoliva - # sed -i "/\\($1\\)/d" $2 - # echo $2: removed $1 support - # check_changed $2 - if sed -n "/\\($1\\)/p" $2 | grep . > /dev/null; then - : - else - die $2 does not contain matches for $1 - fi + #$1 = config $2 = Makefile name + # We don't clean up Makefiles any more --lxoliva + # sed -i "/\\($1\\)/d" $2 + # echo $2: removed $1 support + # check_changed $2 + filetest $2 || return + if sed -n "/\\($1\\)/p" $2 | grep . > /dev/null; then + : + else + die $2 does not contain matches for $1 + fi } clean_sed () { - #$1 = sed-script $2 = file $3 = comment - sed -e "$1" "$2" > "$2".deblob - echo $2: ${3-applied sed script $1} - check_changed "$2" + #$1 = sed-script $2 = file $3 = comment + filetest $2 || return + sed -e "$1" "$2" > "$2".deblob || { + die $2: failed: ${3-applied sed script $1} && return 1; } + check_changed $2 && echo $2: ${3-applied sed script $1} } reject_firmware () { - #$1 = file - clean_sed ' + #$1 = file + filetest $1 || return + clean_sed ' s,request\(_ihex\)\?_firmware\(_nowait\)\?,reject_firmware\2,g ' "$1" 'disabled non-Free firmware-loading machinery' } maybe_reject_firmware () { - #$1 = file - clean_sed ' + #$1 = file + filetest $1 || return + clean_sed ' s,request_firmware\(_nowait\)\?,maybe_reject_firmware\1,g ' "$1" 'retain Free firmware-loading machinery, disabling non-Free one' } @@ -203,8 +217,8 @@ undefine_macro () { macro=$1 repl=$2 msg=$3; shift 3 for f in "$@"; do clean_sed " - s,^#define $macro .*\$,/*(DEBLOBBED)*/,; - s,$macro,$repl,g; +s,^#define $macro .*\$,/*(DEBLOBBED)*/,; +s,$macro,$repl,g; " "$f" "$msg" done } @@ -255,18 +269,18 @@ for f in \ sound/pci/cs46xx/imgs/cwcdma.asp \ ; do if test ! $f; then - die $f is not present, something is amiss + die $f is not present, something is amiss && return fi done # Identify the tarball. -clean_sed " -s,^EXTRAVERSION.*,&-libre$extra, +grep -q 'EXTRAVERSION.*-libre' Makefile || +clean_sed "s,^EXTRAVERSION.*,&-libre$extra, " Makefile 'added -libre to EXTRAVERSION' # Add reject_firmware and maybe_reject_firmware -clean_sed ' -$i\ +grep -q _LINUX_LIBRE_FIRMWARE_H include/linux/firmware.h || +clean_sed '$i\ #ifndef _LINUX_LIBRE_FIRMWARE_H\ #define _LINUX_LIBRE_FIRMWARE_H\ \ @@ -474,6 +488,15 @@ clean_sed ' clean_blob drivers/gpu/drm/radeon/radeon_cp.c clean_blob drivers/gpu/drm/radeon/radeon_microcode.h clean_sed ' +/^static void r100_cp_load_microcode(struct radeon_device \*rdev)/i\ +#define r100_cp_load_microcode(rdev) \\\ + do { \\\ + DRM_ERROR("Missing Free microcode!\\n"); \\\ + return -EINVAL; \\\ + } while (0) +' drivers/gpu/drm/radeon/r100.c 'report missing Free microcode' +clean_blob drivers/gpu/drm/radeon/r100.c +clean_sed ' /^static void r600_cp_load_microcode(drm_radeon_private_t \*dev_priv)/i\ #define r600_cp_load_microcode(dev_priv) \\\ do { \\\ @@ -1001,7 +1024,7 @@ clean_sed ' /for (p = PhyUcode/i\ printk("%s: missing Free firmware\\n", __func__);\ return (STATUS_FAILURE);\ -#define PhyUcode NULL +#define PhyUcode NULL }' drivers/staging/sxg/sxg.c 'report missing Free firmware' clean_blob drivers/staging/sxg/sxg.c clean_kconfig drivers/staging/sxg/Kconfig 'SXG' @@ -1363,7 +1386,7 @@ clean_sed ' /^INT[ ]set_eFuseLoadFromBin_Proc(/,/^}$/{ /src = kmalloc/i\ printk("%s: missing Free firmware\\n", __func__);\ - return FALSE; + return FALSE; }' drivers/staging/rt2860/common/eeprom.c 'report missing Free firmware' clean_blob drivers/staging/rt2860/common/eeprom.c clean_kconfig drivers/staging/rt2860/Kconfig RT2860 @@ -1377,7 +1400,7 @@ clean_mk CONFIG_RT2870 drivers/staging/rt2870/Makefile announce RT3070 - "Ralink 3070 wireless support" clean_file drivers/staging/rt3070/firmware.h clean_kconfig drivers/staging/rt3070/Kconfig RT3070 -clean_kconfig 'CONFIG_RT3070' drivers/staging/rt3070/Makefile +clean_mk CONFIG_RT3070 drivers/staging/rt3070/Makefile announce RTL8192SU - "RealTek RTL8192SU Wireless LAN NIC driver" reject_firmware drivers/staging/rtl8192su/r819xU_firmware.c @@ -1490,6 +1513,14 @@ clean_mk CONFIG_COMEDI_USB_DRIVERS drivers/staging/comedi/drivers/Makefile announce ME4000 - "Meilhaus ME-4000 I/O board" clean_file drivers/staging/me4000/me4000_firmware.h clean_file drivers/staging/me4000/me4610_firmware.h +clean_sed ' +/^static int me4000_xilinx_download([^;]*$/,/^}$/{ + /firm = .*xilinx_firm.*/i\ + printk(KERN_ERR "me4000: Missing Free firmware\\n");\ + return -EIO; +} +' drivers/staging/me4000/me4000.c 'report missing Free firmware' +clean_blob drivers/staging/me4000/me4000.c clean_kconfig drivers/staging/me4000/Kconfig 'ME4000' clean_mk CONFIG_ME4000 drivers/staging/me4000/Makefile @@ -1970,10 +2001,15 @@ clean_blob Documentation/sound/alsa/ALSA-Configuration.txt clean_blob Documentation/sound/oss/MultiSound clean_blob Documentation/sound/oss/PSS clean_blob Documentation/sound/oss/PSS-updates +clean_blob Documentation/sound/oss/README.OSS clean_file Documentation/dvb/get_dvb_firmware clean_file Documentation/video4linux/extract_xc3028.pl clean_sed s,usb8388,whatever,g drivers/base/Kconfig 'removed blob name' clean_blob firmware/README.AddingFirmware clean_blob firmware/WHENCE +if $errors; then + echo errors above were ignored because of --force >&2 +fi + exit 0