[kernel] r5147 - in dists/trunk/linux-2.6/debian: . bin

[Sven Luther]

Author: luther
Date: Fri Dec 30 09:15:47 2005
New Revision: 5147

Modified:
   dists/trunk/linux-2.6/debian/bin/kconfig.ml
   dists/trunk/linux-2.6/debian/rules.real
Log:
$(basedir) includes arch name, so pass -ba option to kconfig.ml
now output errors and verbose messages to stderr.


Modified: dists/trunk/linux-2.6/debian/bin/kconfig.ml
==============================================================================
--- dists/trunk/linux-2.6/debian/bin/kconfig.ml	(original)
+++ dists/trunk/linux-2.6/debian/bin/kconfig.ml	Fri Dec 30 09:15:47 2005
@@ -105,9 +105,9 @@
   begin
     if !verbose then
       if !config_name <> "" then
-        Printf.printf "Reading config file %s" !config_name
+        Printf.eprintf "Reading config file %s" !config_name
       else
-        Printf.printf "Creating config file for arch %s, subarch %s, flavour %s (basedir is %s)\n" !arch !subarch !flavour !basedir
+        Printf.eprintf "Creating config file for arch %s, subarch %s, flavour %s (basedir is %s)\n" !arch !subarch !flavour !basedir
   end;
   if !config_name <> "" then 
     try
@@ -115,24 +115,21 @@
       let m = parse_config config C.empty in
       print_config m;
       close_in config
-    with Sys_error s -> Printf.printf "Error: %s\n" s
+    with Sys_error s -> Printf.eprintf "Error: %s\n" s
   else if !arch <> "" && !flavour <> "" then
     try
       let dir = if !archindir then Filename.dirname !basedir else !basedir in
       let m = parse_config_file (dir ^ "/config") C.empty false in
       let archdir = dir ^ "/" ^ !arch in
       let m = parse_config_file (archdir ^ "/config") m false in
-      let () = if !verbose then Printf.printf "XXX archdir is %s\n" archdir else () in
       let m, archdir = 
         if !subarch <> ""  && !subarch <> "none" then 
-	  let () = if !verbose then Printf.printf "XXX subarch case ... subarch is %s\n" !subarch else () in
 	  let archdir = archdir ^ "/" ^ !subarch in
           parse_config_file (archdir ^ "/config") m false, archdir
 	else m, archdir
       in
-      let () = if !verbose then Printf.printf "XXX archdir is %s\n" archdir else () in
       let m = parse_config_file (archdir ^ "/config." ^ !flavour) m true in
       print_config m;
-    with Sys_error s -> Printf.printf "Error: %s\n" s
+    with Sys_error s -> Printf.eprintf "Error: %s\n" s
   else
     usage ()

Modified: dists/trunk/linux-2.6/debian/rules.real
==============================================================================
--- dists/trunk/linux-2.6/debian/rules.real	(original)
+++ dists/trunk/linux-2.6/debian/rules.real	Fri Dec 30 09:15:47 2005
@@ -93,7 +93,7 @@
 endif
 $(BUILD_DIR)/config.$(ARCH)-$(SUBARCH)-$(FLAVOUR): $(basedir)/config.$(FLAVOUR) $(config_common)
 	@echo "Generating configuration file $@:"
-	debian/bin/kconfig.ml -b "$(basedir)" -a "$(ARCH)" -s "$(SUBARCH)" -f "$(FLAVOUR)" > '$@'
+	debian/bin/kconfig.ml -ba -b "$(basedir)" -a "$(ARCH)" -s "$(SUBARCH)" -f "$(FLAVOUR)" > '$@'
 
 $(BUILD_DIR)/linux-source-$(UPSTREAM_VERSION).tar.bz2: SOURCE_DIR=$(BUILD_DIR)/source
 $(BUILD_DIR)/linux-source-$(UPSTREAM_VERSION).tar.bz2: DIR = $(BUILD_DIR)/linux-source-$(UPSTREAM_VERSION)