projects
/
releases.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New
[releases.git]
/
deblob-2.6.25
diff --git
a/deblob-2.6.25
b/deblob-2.6.25
index 90502279d962d18b47745d3b664df3a93b02ce81..2091069a8235fa9984fc5fed30cd15de0ff97170 100755
(executable)
--- a/
deblob-2.6.25
+++ b/
deblob-2.6.25
@@
-44,11
+44,15
@@
# For each kver release, start extra with an empty string, then count
# from 1 if changes are needed that require rebuilding the tarball.
# 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=3++
+kver=2.6.25 extra=4++
+
+case $1 in
+--force) die () { echo ERROR: "$@": ignored >&2; }; shift;;
+*) die () { echo "$@" >&2; exit 1; };;
+esac
if unifdef -Utest /dev/null; then :; else
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
fi
check=`echo $0 | sed 's,/[^/]*$,,'`/deblob-check
@@
-62,19
+66,16
@@
fi
function clean_file {
#$1 = filename
if test ! -f $1; then
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
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
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
}
fi
mv $1.deblob $1
}
@@
-83,8
+84,7
@@
function clean_blob {
#$1 = filename
if $have_check; then
if test ! -f $1; then
#$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
fi
name=$1
echo Removing blobs from $name
@@
-114,8
+114,7
@@
function clean_mk {
if sed -n "/\\($1\\)/p" $2 | grep . > /dev/null; then
:
else
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
}
fi
}
@@
-163,8
+162,7
@@
for f in \
sound/pci/cs46xx/imgs/cwcdma.asp \
; do
if test ! $f; then
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
fi
done
@@
-372,7
+370,9
@@
clean_kconfig drivers/net/Kconfig 'TEHUTI'
clean_mk CONFIG_TEHUTI drivers/net/Makefile
# TIGON3 - Broadcom Tigon3
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 @@
--- drivers/net/tg3.c
+++ drivers/net/tg3.c
@@ -5,14 +5,6 @@