X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=deblob-2.6.24;h=1b7dc4a66ac39a49a88c63aec337f988399efe12;hb=c9f9eb2f3878d9aabce50fe2e4e6040fc97b6b02;hp=efd00d3fed54e1e550ed756bad42f1fea7be6b71;hpb=c9e4fc5b78dbb880bcc4df3f4f65f1d9157891b6;p=releases.git

diff --git a/deblob-2.6.24 b/deblob-2.6.24
index efd00d3fed54..1b7dc4a66ac3 100755
--- 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.
-kver=2.6.25 extra=
+kver=2.6.24 extra=1
 
 sed -i "s,^EXTRAVERSION.*,EXTRAVERSION = -libre$extra," Makefile
 
@@ -58,6 +58,14 @@ function clean_file {
 	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.deblobbed $1
+}
+
 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
-	    mv $name.deblob $name
+	    check_changed $name
 	else
 	    clean_file $1
 	fi
@@ -74,9 +82,10 @@ function clean_blob {
 
 function clean_kconfig {
         #$1 = filename $2 = things to remove
-	sed -i "/^config $2\$/{p;i\
+	sed "/^config $2\$/{p;i\
 	depends on NONFREE
-d;}" $1
+d;}" $1 > $1.deblob
+	check_changed $1
 }
 
 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
-	mv $1.deblob $1
+	check_changed $1
 }
 
 #######################