SOURCES: kernel-track-config-change.awk, kernel-config.awk - remember where...

[sparky]

Author: sparky                       Date: Sun Sep 28 14:54:52 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- remember where each option was defined

---- Files affected:
SOURCES:
   kernel-track-config-change.awk (1.2 -> 1.3) , kernel-config.awk (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: SOURCES/kernel-track-config-change.awk
diff -u SOURCES/kernel-track-config-change.awk:1.2 SOURCES/kernel-track-config-change.awk:1.3
--- SOURCES/kernel-track-config-change.awk:1.2	Sun Sep 28 16:39:09 2008
+++ SOURCES/kernel-track-config-change.awk	Sun Sep 28 16:54:46 2008
@@ -6,17 +6,23 @@
 		exit 1
 	}
 
+	file = ""
 	while ( getline < infile ) {
+		name = ""
 		if ( match( $0, /^# CONFIG_[A-Za-z0-9_]+ is not set$/ ) ) {
-			optionArray[ $2 ] = "n";
+			name = $2
+			value = "n"
 		} else if ( match( $0, /^CONFIG_[A-Za-z0-9_]+=/ ) ) {
 			name = value = $1
 
 			sub( /=.*$/, "", name )
 			sub( /^[^=]*=/, "", value )
-
-			optionArray[ name ] = value;
-			continue
+		} else if ( match( $0, /^# file:/ ) ) {
+			file = $3
+		}
+		if ( length( name ) ) {
+			optionArray[ name ] = value
+			optionFile[ name ] = file
 		}
 	}
 
@@ -49,7 +55,7 @@
 		#print "Warning: new option " name " with value " value
 	} else {
 		if ( value != orig ) {
-			print "ERROR: option " name " redefined from " orig " to " value
+			print "ERROR (" optionFile[ name ] "): option " name " redefined from " orig " to " value
 			foundErrors++
 		}
 	}

================================================================
Index: SOURCES/kernel-config.awk
diff -u SOURCES/kernel-config.awk:1.9 SOURCES/kernel-config.awk:1.10
--- SOURCES/kernel-config.awk:1.9	Sat Sep 27 23:29:19 2008
+++ SOURCES/kernel-config.awk	Sun Sep 28 16:54:46 2008
@@ -56,11 +56,22 @@
 	targetLevel[ arch ] = 3
 
 	shouldDie = 0
+
+	lastFile = ""
 }
 
 function dieLater( code ) {
 	if ( shouldDie < code )
 		shouldDie = code
+}
+
+{
+	f = FILENAME
+	sub( /^.*\//, "", f ) # strip path
+	if ( f != lastFile ) {
+		print "\n# file: " f
+		lastFile = f
+	}
 }
 
 # convert special case:
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-track-config-change.awk?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-config.awk?r1=1.9&r2=1.10&f=u