[kernel] r5128 - dists/trunk/scripts

[Jonas Smedegaard]

Author: js
Date: Thu Dec 29 12:38:18 2005
New Revision: 5128

Modified:
   dists/trunk/scripts/split-config-cleanup
Log:
Fix default per-file cleaning (without -f) to strip only after first _enabled_ option (ignoring disabled options before that). Cosmetic fix.

Modified: dists/trunk/scripts/split-config-cleanup
==============================================================================
--- dists/trunk/scripts/split-config-cleanup	(original)
+++ dists/trunk/scripts/split-config-cleanup	Thu Dec 29 12:38:18 2005
@@ -27,7 +27,7 @@
 	bloatfile="$1"
 	while read option; do
 		tac "$bloatfile" > "$bloatfile.tmp"
-		perl -ni -e "print and next unless /$option[= ]/; \$n++; print if \$n==1;" "$bloatfile.tmp"
+		perl -ni -e "print and next unless /^$option[= ]/; \$n++; print if \$n==1;" "$bloatfile.tmp"
 		tac "$bloatfile.tmp" > "$bloatfile"
 		rm "$bloatfile.tmp"
 	done
@@ -97,13 +97,13 @@
 		find_duplicate_options "$basedir/config" "$basedir/$arch/config" "$basedir/$arch/config.$subarch" \
 			> "$TMPFILE"
 		strip_all_options "$TMPFILE" "$basedir/$arch/config.$subarch"
-	echo ' Done!'
 		echo -n '.'
 		# Clean arch file
 		find_duplicate_options "$basedir/config" "$basedir/$arch/config" \
 			> "$TMPFILE"
 		strip_all_options "$TMPFILE" "$basedir/$arch/config"
 	fi
+	echo ' Done!'
 done
 
 rm "$TMPFILE"