projects
/
releases.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't rename .deblobbed, it's .deblob.
[releases.git]
/
deblob-2.6.24
diff --git
a/deblob-2.6.24
b/deblob-2.6.24
index efd00d3fed54e1e550ed756bad42f1fea7be6b71..4da941e36591ee0cbc7311c77acc981373e49e1d 100755
(executable)
--- a/
deblob-2.6.24
+++ b/
deblob-2.6.24
@@
-40,7
+40,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.2
5 extra=
+kver=2.6.2
4 extra=1
sed -i "s,^EXTRAVERSION.*,EXTRAVERSION = -libre$extra," Makefile
sed -i "s,^EXTRAVERSION.*,EXTRAVERSION = -libre$extra," Makefile
@@
-58,6
+58,14
@@
function clean_file {
rm -v $1
}
rm -v $1
}
+function check_changed {
+ if cmp $1.deblob $1; then
+ echo $1 did not change, something is wrong >&2
+ exit 1
+ fi
+ mv $1.deblob $1
+}
+
check=`echo $0 | sed 's,/[^/]*$,,'`/deblob-check
function clean_blob {
#$1 = filename
check=`echo $0 | sed 's,/[^/]*$,,'`/deblob-check
function clean_blob {
#$1 = filename
@@
-66,7
+74,7
@@
function clean_blob {
set fnord "$@" -d
shift 2
$check "$@" $name > $name.deblob
set fnord "$@" -d
shift 2
$check "$@" $name > $name.deblob
-
mv $name.deblob
$name
+
check_changed
$name
else
clean_file $1
fi
else
clean_file $1
fi
@@
-74,9
+82,10
@@
function clean_blob {
function clean_kconfig {
#$1 = filename $2 = things to remove
function clean_kconfig {
#$1 = filename $2 = things to remove
- sed
-i
"/^config $2\$/{p;i\
+ sed "/^config $2\$/{p;i\
depends on NONFREE
depends on NONFREE
-d;}" $1
+d;}" $1 > $1.deblob
+ check_changed $1
}
function clean_mk {
}
function clean_mk {
@@
-88,7
+97,7
@@
function clean_mk {
function clean_ifdef {
#$1 = filename $2 = macro to -U
unifdef $1 -U$2 > $1.deblob
function clean_ifdef {
#$1 = filename $2 = macro to -U
unifdef $1 -U$2 > $1.deblob
-
mv $1.deblob
$1
+
check_changed
$1
}
#######################
}
#######################