X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=deblob-2.6.25;h=2f3457d57043799b7f2d70ca49e77f3469e1d774;hb=c9e4fc5b78dbb880bcc4df3f4f65f1d9157891b6;hp=4228526ab3ce5d285a42a65da2b675f49443f262;hpb=6c016ab67cdaa5bacc041eec2322fa1c0f1f4c10;p=releases.git diff --git a/deblob-2.6.25 b/deblob-2.6.25 index 4228526ab3ce..2f3457d57043 100755 --- a/deblob-2.6.25 +++ b/deblob-2.6.25 @@ -38,6 +38,12 @@ # GPLed sources is replaced with /*(DEBLOBBED)*/ if the deblob-check # script, that knows how to do this, is present. -lxoliva +# 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.25 extra= + +sed -i "s,^EXTRAVERSION.*,EXTRAVERSION = -libre$extra," Makefile + #################### # FOOOOO XXXXXX # drivers/net/tokenring/Kconfig needs as last line: @@ -52,11 +58,15 @@ function clean_file { rm -v $1 } +check=`echo $0 | sed 's,/[^/]*$,,'`/deblob-check function clean_blob { #$1 = filename - if test -f $0-check; then - $0-check -d $1 > $1.deblob - mv $1.deblob $1 + if test -f $check; then + name=$1 + set fnord "$@" -d + shift 2 + $check "$@" $name > $name.deblob + mv $name.deblob $name else clean_file $1 fi @@ -316,8 +326,8 @@ patch --no-backup-if-mismatch -p0 <<\EOF # patches/linux-2.6-tg3-clean.patch EOF -clean_blob drivers/net/tg3.c - +clean_blob drivers/net/tg3.c -s 9 +sed -i 's:\(\/\*(DEBLOBBED)\*\/\),:\1:' drivers/net/tg3.c # TYPHOON - 3cr990 series Typhoon clean_blob drivers/net/typhoon-firmware.h