[kernel] r6268 - in dists/trunk: linux-2.6/debian linux-2.6/debian/arch scripts

[Jonas Smedegaard]

Author: js
Date: Thu Mar 23 11:27:14 2006
New Revision: 6268

Modified:
   dists/trunk/linux-2.6/debian/arch/defines
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/scripts/split-config-cleanup
Log:
Tighten yaird dependency to at least 0.0.12-8 (expected to reach etch tonight).

Modified: dists/trunk/linux-2.6/debian/arch/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/defines	(original)
+++ dists/trunk/linux-2.6/debian/arch/defines	Thu Mar 23 11:27:14 2006
@@ -30,5 +30,5 @@
 gcc-3.3: gcc-3.3
 initramfs-fallback: linux-initramfs-tool
 initramfs-tools: initramfs-tools (>= 0.53)
-yaird: yaird
+yaird: yaird (>= 0.0.12-8)
 

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Thu Mar 23 11:27:14 2006
@@ -1,8 +1,14 @@
 linux-2.6 (2.6.16-99experimental.1) UNRELEASED; urgency=low
 
+  [ Bastian Blank ]
   *
 
- -- Bastian Blank <waldi at debian.org>  Mon, 20 Mar 2006 12:33:49 +0100
+  [ Jonas Smedegaard ]
+  * Tighten yaird dependency to at least 0.0.12-8 (supporting
+    Linux 2.6.16 uppercase hex in Kconfig and new IDE sysfs naming, and
+    VIA IDE on powerpc).
+
+ -- Jonas Smedegaard <dr at jones.dk>  Thu, 23 Mar 2006 12:23:22 +0100
 
 linux-2.6 (2.6.16-2) unstable; urgency=low
 

Modified: dists/trunk/scripts/split-config-cleanup
==============================================================================
--- dists/trunk/scripts/split-config-cleanup	(original)
+++ dists/trunk/scripts/split-config-cleanup	Thu Mar 23 11:27:14 2006
@@ -16,12 +16,34 @@
 }
 
 function find_duplicate_options() {
-	# Scan all files provided as arguments for kernel options
+	# Scan configfile(s) for kernel options, both defined and undefined
 	# Emit options mentioned more than once
 	egrep -h '^([^# ]|.* is not set)' "$@" \
 		| sed -e 's/[# ]*//' -e 's/[= ].*//' | sort | uniq -d
 }
 
+function find_option_values() {
+	# Scan configfile(s) for a single kernel option
+	# Emit full config lines of each possible setting of the option
+	option="$1"
+	shift
+	grep -h -F "$option" "$@" \
+		| sort -u
+}
+
+function scan_configfile() {
+	file="$1"
+	find_duplicate_options "$file" | (
+		while read option; do
+			find_option_values "$option" "$file" | (
+				while read value; do
+					echo "duplicate: $option: $value"
+				done
+			)
+		done
+	)
+}
+
 function strip_duplicate_options() {
 	# Strip from bloatfile all but last of each entry on stdin
 	bloatfile="$1"
@@ -79,31 +101,43 @@
 	exit 1
 fi
 
-TMPFILE=`mktemp -t "$scriptname.XXXXXX"` || exit 1
+TMPCONFIG=`mktemp -t "$scriptname.XXXXXX"` || exit 1
 
 for path in $paths; do
+
+## Collect all options: Add them to $options and `sort -u` the list
+# Collect all $duplicate_options and `sort -u` the list
+# For each of $duplicate_options collect $values_${option} and $value_{0,1,2...}_${option} for each value
+# Ask what 
+
 	basedir="$(dirname "$(dirname "$path")")"
 	arch="$(basename "$(dirname "$path")")"
 	subarch="$(basename "$path" | sed 's/^config\.//')"
 	echo -n "cleaning $arch/$subarch..."
 	# Cleanup each individual file
 	for file in "$basedir/config" "$basedir/$arch/config" "$basedir/$arch/config.$subarch"; do
-		find_duplicate_options "$file" > "$TMPFILE"
-		cat "$TMPFILE" | strip_duplicate_options "$file"
+#		cat "$file" > "$TMPCONFIG"
+		scan_configfile "$file"
+		# Collect dupes
+#		strip_duplicate_options
+#		cat "$TMPCONFIG" > "$file"
 	done
+exit 1
 	if [ -n "$full" ]; then
 		echo -n '.'
 		# Clean subarch file
-		find_duplicate_options "$basedir/config" "$basedir/$arch/config" "$basedir/$arch/config.$subarch" \
-			> "$TMPFILE"
-		strip_all_options "$TMPFILE" "$basedir/$arch/config.$subarch"
+		cat "$basedir/config" "$basedir/$arch/config" "$basedir/$arch/config.$subarch" > "$TMPCONFIG"
+		find_duplicate_options
+		strip_all_options
+		cat "$TMPCONFIG" > "$basedir/$arch/config.$subarch"
 		echo -n '.'
 		# Clean arch file
-		find_duplicate_options "$basedir/config" "$basedir/$arch/config" \
-			> "$TMPFILE"
-		strip_all_options "$TMPFILE" "$basedir/$arch/config"
+		cat "$basedir/config" "$basedir/$arch/config" > "$TMPCONFIG"
+		find_duplicate_options
+		strip_all_options
+		cat "$TMPCONFIG" > "$basedir/$arch/config"
 	fi
 	echo ' Done!'
 done
 
-rm "$TMPFILE"
+rm "$TMPCONFIG" "$TMPDUPES"