[kernel] r5120 - dists/trunk/scripts

Jonas Smedegaard js at costa.debian.org
Thu Dec 29 02:41:05 UTC 2005


Author: js
Date: Thu Dec 29 02:41:05 2005
New Revision: 5120

Modified:
   dists/trunk/scripts/split-config-cleanup
Log:
Fix cross-file comparison between global and arch (not arch and subarch).

Modified: dists/trunk/scripts/split-config-cleanup
==============================================================================
--- dists/trunk/scripts/split-config-cleanup	(original)
+++ dists/trunk/scripts/split-config-cleanup	Thu Dec 29 02:41:05 2005
@@ -98,12 +98,9 @@
 			> "$TMPFILE"
 		strip_all_options "$TMPFILE" "$basedir/$arch/config.$subarch"
 	echo ' Done!'
-	if [ "$subarch" = "ixp4xx" ]; then
-		exit 1
-	fi
 		echo -n '.'
 		# Clean arch file
-		find_duplicate_options "$basedir/$arch/config" "$basedir/$arch/config.$subarch" \
+		find_duplicate_options "$basedir/config" "$basedir/$arch/config" \
 			> "$TMPFILE"
 		strip_all_options "$TMPFILE" "$basedir/$arch/config"
 	fi



More information about the Kernel-svn-changes mailing list