X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=deblob-2.6.28;h=e02d3873b08df38f112a10fa473eae83880faa0b;hb=029dda82fd810a85acd2bd9ba975aa130efb96b9;hp=ab30ec0350ad63de5e921b2a553228560c984fd9;hpb=bab88abd855f38c7f42fd45a5b4bf599f92490d0;p=releases.git diff --git a/deblob-2.6.28 b/deblob-2.6.28 index ab30ec0350ad..e02d3873b08d 100755 --- a/deblob-2.6.28 +++ b/deblob-2.6.28 @@ -1,6 +1,6 @@ #!/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 # @@ -37,15 +37,14 @@ # See also: # http://wiki.debian.org/KernelFirmwareLicensing # svn://svn.debian.org/kernel/dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1 -# http://svn.gnewsense.svnhopper.net/gnewsense/builder/trunk/firmware/firmware-removed -# http://svn.gnewsense.svnhopper.net/gnewsense/builder/trunk/gen-kernel +# http://wiki.gnewsense.org/Builder gen-kernel # Thanks to Brian Brazil @ gnewsense # 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.28 extra=3++ +kver=2.6.28 extra=4++ case $1 in --force) @@ -190,7 +189,7 @@ clean_sed () { 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} + check_changed $2 && echo $2: ${3-applied sed script $1} } reject_firmware () { @@ -1010,7 +1009,7 @@ clean_sed ' /for (p = PhyUcode/i\ printk(KERN_ERR KBUILD_MODNAME ": missing Free firmware\\n");\ 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' @@ -1872,6 +1871,7 @@ 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'