From: lxoliva Date: Sun, 7 Sep 2008 05:56:01 +0000 (+0000) Subject: Add --force command-line flag, to ignore some errors. X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;ds=inline;h=34e00f2dbb6cb7d8999e4ca8281273773e7e2821;p=releases.git Add --force command-line flag, to ignore some errors. git-svn-id: http://www.fsfla.org/svn/fsfla/software/linux-libre/scripts@4207 559672b5-ba27-0410-b829-e8f1faed8b1b --- diff --git a/deblob-2.6.21 b/deblob-2.6.21 index ba6c59c2b7c7..e825b793c542 100755 --- a/deblob-2.6.21 +++ b/deblob-2.6.21 @@ -46,9 +46,13 @@ # from 1 if changes are needed that require rebuilding the tarball. kver=2.6.21 extra=0++ +case $1 in +--force) die () { echo ERROR: "$@": ignored >&2; }; shift;; +*) die () { echo "$@" >&2; exit 1; };; +esac + if unifdef -Utest /dev/null; then :; else - echo unifdef is required >&2 - exit 1 + die unifdef is required fi check=`echo $0 | sed 's,/[^/]*$,,'`/deblob-check @@ -62,19 +66,16 @@ fi function clean_file { #$1 = filename if test ! -f $1; then - echo $1 does not exist, something is wrong >&2 - exit 1 + die $1 does not exist, something is wrong fi rm -v $1 } function check_changed { if test ! -f $1; then - echo $1 does not exist, something is wrong >&2 - exit 1 + die $1 does not exist, something is wrong elif cmp $1.deblob $1 > /dev/null; then - echo $1 did not change, something is wrong >&2 - exit 1 + die $1 did not change, something is wrong fi mv $1.deblob $1 } @@ -83,8 +84,7 @@ function clean_blob { #$1 = filename if $have_check; then if test ! -f $1; then - echo $1 does not exist, something is wrong >&2 - exit 1 + die $1 does not exist, something is wrong fi name=$1 echo Removing blobs from $name @@ -163,8 +163,7 @@ for f in \ sound/pci/cs46xx/imgs/cwcdma.asp \ ; do if test ! $f; then - echo $f is not present, something is amiss >&2 - exit 1 + die $f is not present, something is amiss fi done diff --git a/deblob-2.6.22 b/deblob-2.6.22 index ff1379cdfa48..9203b7254013 100755 --- a/deblob-2.6.22 +++ b/deblob-2.6.22 @@ -46,9 +46,13 @@ # from 1 if changes are needed that require rebuilding the tarball. kver=2.6.22 extra=0++ +case $1 in +--force) die () { echo ERROR: "$@": ignored >&2; }; shift;; +*) die () { echo "$@" >&2; exit 1; };; +esac + if unifdef -Utest /dev/null; then :; else - echo unifdef is required >&2 - exit 1 + die unifdef is required fi check=`echo $0 | sed 's,/[^/]*$,,'`/deblob-check @@ -62,19 +66,16 @@ fi function clean_file { #$1 = filename if test ! -f $1; then - echo $1 does not exist, something is wrong >&2 - exit 1 + die $1 does not exist, something is wrong fi rm -v $1 } function check_changed { if test ! -f $1; then - echo $1 does not exist, something is wrong >&2 - exit 1 + die $1 does not exist, something is wrong elif cmp $1.deblob $1 > /dev/null; then - echo $1 did not change, something is wrong >&2 - exit 1 + die $1 did not change, something is wrong fi mv $1.deblob $1 } @@ -83,8 +84,7 @@ function clean_blob { #$1 = filename if $have_check; then if test ! -f $1; then - echo $1 does not exist, something is wrong >&2 - exit 1 + die $1 does not exist, something is wrong fi name=$1 echo Removing blobs from $name @@ -163,8 +163,7 @@ for f in \ sound/pci/cs46xx/imgs/cwcdma.asp \ ; do if test ! $f; then - echo $f is not present, something is amiss >&2 - exit 1 + die $f is not present, something is amiss fi done diff --git a/deblob-2.6.23 b/deblob-2.6.23 index 9676de53c4a0..5bd24b96593e 100755 --- a/deblob-2.6.23 +++ b/deblob-2.6.23 @@ -46,9 +46,13 @@ # from 1 if changes are needed that require rebuilding the tarball. kver=2.6.23 extra=3++ +case $1 in +--force) die () { echo ERROR: "$@": ignored >&2; }; shift;; +*) die () { echo "$@" >&2; exit 1; };; +esac + if unifdef -Utest /dev/null; then :; else - echo unifdef is required >&2 - exit 1 + die unifdef is required fi check=`echo $0 | sed 's,/[^/]*$,,'`/deblob-check @@ -62,19 +66,16 @@ fi function clean_file { #$1 = filename if test ! -f $1; then - echo $1 does not exist, something is wrong >&2 - exit 1 + die $1 does not exist, something is wrong fi rm -v $1 } function check_changed { if test ! -f $1; then - echo $1 does not exist, something is wrong >&2 - exit 1 + die $1 does not exist, something is wrong elif cmp $1.deblob $1 > /dev/null; then - echo $1 did not change, something is wrong >&2 - exit 1 + die $1 did not change, something is wrong fi mv $1.deblob $1 } @@ -83,8 +84,7 @@ function clean_blob { #$1 = filename if $have_check; then if test ! -f $1; then - echo $1 does not exist, something is wrong >&2 - exit 1 + die $1 does not exist, something is wrong fi name=$1 echo Removing blobs from $name @@ -163,8 +163,7 @@ for f in \ sound/pci/cs46xx/imgs/cwcdma.asp \ ; do if test ! $f; then - echo $f is not present, something is amiss >&2 - exit 1 + die $f is not present, something is amiss fi done diff --git a/deblob-2.6.24 b/deblob-2.6.24 index 4db5cfb64155..c838cf4c1d85 100755 --- a/deblob-2.6.24 +++ b/deblob-2.6.24 @@ -46,9 +46,13 @@ # from 1 if changes are needed that require rebuilding the tarball. kver=2.6.24 extra=3++ +case $1 in +--force) die () { echo ERROR: "$@": ignored >&2; }; shift;; +*) die () { echo "$@" >&2; exit 1; };; +esac + if unifdef -Utest /dev/null; then :; else - echo unifdef is required >&2 - exit 1 + die unifdef is required fi check=`echo $0 | sed 's,/[^/]*$,,'`/deblob-check @@ -62,19 +66,16 @@ fi function clean_file { #$1 = filename if test ! -f $1; then - echo $1 does not exist, something is wrong >&2 - exit 1 + die $1 does not exist, something is wrong fi rm -v $1 } function check_changed { if test ! -f $1; then - echo $1 does not exist, something is wrong >&2 - exit 1 + die $1 does not exist, something is wrong elif cmp $1.deblob $1 > /dev/null; then - echo $1 did not change, something is wrong >&2 - exit 1 + die $1 did not change, something is wrong fi mv $1.deblob $1 } @@ -83,8 +84,7 @@ function clean_blob { #$1 = filename if $have_check; then if test ! -f $1; then - echo $1 does not exist, something is wrong >&2 - exit 1 + die $1 does not exist, something is wrong fi name=$1 echo Removing blobs from $name @@ -163,8 +163,7 @@ for f in \ sound/pci/cs46xx/imgs/cwcdma.asp \ ; do if test ! $f; then - echo $f is not present, something is amiss >&2 - exit 1 + die $f is not present, something is amiss fi done diff --git a/deblob-2.6.25 b/deblob-2.6.25 index 90502279d962..c3d60043e507 100755 --- a/deblob-2.6.25 +++ b/deblob-2.6.25 @@ -46,9 +46,13 @@ # from 1 if changes are needed that require rebuilding the tarball. kver=2.6.25 extra=3++ +case $1 in +--force) die () { echo ERROR: "$@": ignored >&2; }; shift;; +*) die () { echo "$@" >&2; exit 1; };; +esac + if unifdef -Utest /dev/null; then :; else - echo unifdef is required >&2 - exit 1 + die unifdef is required fi check=`echo $0 | sed 's,/[^/]*$,,'`/deblob-check @@ -62,19 +66,16 @@ fi function clean_file { #$1 = filename if test ! -f $1; then - echo $1 does not exist, something is wrong >&2 - exit 1 + die $1 does not exist, something is wrong fi rm -v $1 } function check_changed { if test ! -f $1; then - echo $1 does not exist, something is wrong >&2 - exit 1 + die $1 does not exist, something is wrong elif cmp $1.deblob $1 > /dev/null; then - echo $1 did not change, something is wrong >&2 - exit 1 + die $1 did not change, something is wrong fi mv $1.deblob $1 } @@ -83,8 +84,7 @@ function clean_blob { #$1 = filename if $have_check; then if test ! -f $1; then - echo $1 does not exist, something is wrong >&2 - exit 1 + die $1 does not exist, something is wrong fi name=$1 echo Removing blobs from $name @@ -163,8 +163,7 @@ for f in \ sound/pci/cs46xx/imgs/cwcdma.asp \ ; do if test ! $f; then - echo $f is not present, something is amiss >&2 - exit 1 + die $f is not present, something is amiss fi done diff --git a/deblob-2.6.26 b/deblob-2.6.26 index 19730b341ebe..5b4c5974a56a 100755 --- a/deblob-2.6.26 +++ b/deblob-2.6.26 @@ -46,9 +46,13 @@ # from 1 if changes are needed that require rebuilding the tarball. kver=2.6.26 extra=1++ +case $1 in +--force) die () { echo ERROR: "$@": ignored >&2; }; shift;; +*) die () { echo "$@" >&2; exit 1; };; +esac + if unifdef -Utest /dev/null; then :; else - echo unifdef is required >&2 - exit 1 + die unifdef is required fi check=`echo $0 | sed 's,/[^/]*$,,'`/deblob-check @@ -62,19 +66,16 @@ fi function clean_file { #$1 = filename if test ! -f $1; then - echo $1 does not exist, something is wrong >&2 - exit 1 + die $1 does not exist, something is wrong fi rm -v $1 } function check_changed { if test ! -f $1; then - echo $1 does not exist, something is wrong >&2 - exit 1 + die $1 does not exist, something is wrong elif cmp $1.deblob $1 > /dev/null; then - echo $1 did not change, something is wrong >&2 - exit 1 + die $1 did not change, something is wrong fi mv $1.deblob $1 } @@ -83,8 +84,7 @@ function clean_blob { #$1 = filename if $have_check; then if test ! -f $1; then - echo $1 does not exist, something is wrong >&2 - exit 1 + die $1 does not exist, something is wrong fi name=$1 echo Removing blobs from $name @@ -163,8 +163,7 @@ for f in \ sound/pci/cs46xx/imgs/cwcdma.asp \ ; do if test ! $f; then - echo $f is not present, something is amiss >&2 - exit 1 + die $f is not present, something is amiss fi done diff --git a/deblob-2.6.27 b/deblob-2.6.27 index f1c7991a8800..31fb4bd77ee0 100755 --- a/deblob-2.6.27 +++ b/deblob-2.6.27 @@ -46,6 +46,11 @@ # from 1 if changes are needed that require rebuilding the tarball. kver=2.6.27 extra= +case $1 in +--force) die () { echo ERROR: "$@": ignored >&2; }; shift;; +*) die () { echo "$@" >&2; exit 1; };; +esac + check=`echo $0 | sed 's,/[^/]*$,,'`/deblob-check if [ ! -f $check ] ; then echo optional deblob-check missing, will remove entire files >&2 @@ -57,19 +62,16 @@ fi function clean_file { #$1 = filename if test ! -f $1; then - echo $1 does not exist, something is wrong >&2 - exit 1 + die $1 does not exist, something is wrong fi rm -v $1 } function check_changed { if test ! -f $1; then - echo $1 does not exist, something is wrong >&2 - exit 1 + die $1 does not exist, something is wrong elif cmp $1.deblob $1 > /dev/null; then - echo $1 did not change, something is wrong >&2 - exit 1 + die $1 did not change, something is wrong fi mv $1.deblob $1 } @@ -78,8 +80,7 @@ function clean_blob { #$1 = filename if $have_check; then if test ! -f $1; then - echo $1 does not exist, something is wrong >&2 - exit 1 + die $1 does not exist, something is wrong fi name=$1 echo Removing blobs from $name @@ -188,8 +189,7 @@ for f in \ sound/pci/cs46xx/imgs/cwcdma.asp \ ; do if test ! $f; then - echo $f is not present, something is amiss >&2 - exit 1 + die $f is not present, something is amiss fi done diff --git a/deblob-main b/deblob-main index 4f67d9d688d5..a7796c76ddee 100755 --- a/deblob-main +++ b/deblob-main @@ -52,6 +52,15 @@ # behind, and then it will refuse to run again before you clean it up # by hand. It takes extra care to avoid overwriting useful files. +# If deblob-$mver finds any unexpected situation, it will error out, +# and then deblob-main will quit. Pass --force to deblob-main, before +# any other argument, for deblob-main to ignore any such situations. + +case $1 in +--force) force=--force; shift;; +*) force=;; +esac + mver=$1 extra=$2 sver=$3 kver=$mver$sver libre=libre$extra deblob= dir=`echo $0 | sed 's,/[^/]*$,,'` @@ -165,10 +174,15 @@ cp linux-$kver.tar linux-$kver-$libre.tar cp -lR linux-$kver/. linux-$kver-$libre echo Deblobbing within linux-$kver-$libre -(cd linux-$kver-$libre && /bin/sh ../$deblob) || exit 1 +if (cd linux-$kver-$libre && /bin/sh ../$deblob $force); then + : +else + echo $deblob failed, aborting >&2 + exit 1 +fi rm -f linux-$kver-$libre.patch -# Do not copy these scripts for now, deblob-check regards itself as a blog. +# Do not copy these scripts for now, deblob-check regards itself as a blob. # cp -p $0 $deblob deblob-check linux-$kver-$libre echo Generating linux-$kver-$libre.patch