projects
/
releases.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Note on ++s.
[releases.git]
/
deblob-2.6.25
diff --git
a/deblob-2.6.25
b/deblob-2.6.25
index c3d60043e50703b5439508cd10f4ac3db3fc2198..2091069a8235fa9984fc5fed30cd15de0ff97170 100755
(executable)
--- a/
deblob-2.6.25
+++ b/
deblob-2.6.25
@@
-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.
# 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;;
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
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
}
@@
-371,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 @@