diff options
| author | Alexandre Oliva <lxoliva@fsfla.org> | 2008-12-25 23:37:32 +0000 |
|---|---|---|
| committer | Alexandre Oliva <lxoliva@fsfla.org> | 2008-12-25 23:37:32 +0000 |
| commit | 70aa5b692991efda3ff2fe3eb8a9b1514257d828 (patch) | |
| tree | 044a40755894be185275ad2a7de8b0d1979c4043 /scripts/deblob-2.6.26 | |
| parent | a6ba8309ccc09e8d2c73d379218d07ba8044271a (diff) | |
| download | linux-libre-raptor-70aa5b692991efda3ff2fe3eb8a9b1514257d828.tar.gz linux-libre-raptor-70aa5b692991efda3ff2fe3eb8a9b1514257d828.zip | |
Get --force to avoid some more errors in already clean-up trees.
Suggested by Robert Millan.
Diffstat (limited to 'scripts/deblob-2.6.26')
| -rwxr-xr-x | scripts/deblob-2.6.26 | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/scripts/deblob-2.6.26 b/scripts/deblob-2.6.26 index 81355594c..4254c693c 100755 --- a/scripts/deblob-2.6.26 +++ b/scripts/deblob-2.6.26 @@ -44,7 +44,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=2.6.26 extra=2 +kver=2.6.26 extra=2++ case $1 in --force) die () { echo ERROR: "$@": ignored >&2; }; shift;; @@ -114,8 +114,7 @@ function clean_mk { if sed -n "/\\($1\\)/p" $2 | grep . > /dev/null; then : else - echo $2 does not contain matches for $1 - exit 1 + die $2 does not contain matches for $1 fi } @@ -371,7 +370,9 @@ clean_kconfig drivers/net/Kconfig 'TEHUTI' clean_mk CONFIG_TEHUTI drivers/net/Makefile # TIGON3 - Broadcom Tigon3 -patch --no-backup-if-mismatch -p0 <<\EOF # patches/linux-2.6-tg3-clean.patch +patch --no-backup-if-mismatch --batch -p0 <<\EOF || \ + die failed to remove license comments from drivers/net/tg3.c \ + # patches/linux-2.6-tg3-clean.patch --- drivers/net/tg3.c +++ drivers/net/tg3.c @@ -5,14 +5,6 @@ |
