debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

$(basedir) includes arch name, so pass -ba option to kconfig.ml 

now output errors and verbose messages to stderr.

svn path=/dists/trunk/linux-2.6/; revision=5147
This commit is contained in:
Sven Luther 2005-12-30 09:15:47 +00:00
parent f4817878de
commit 0a6e7fb1dd
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
debian/bin/kconfig.ml vendored
View File

@ -105,9 +105,9 @@ let () =
begin begin
if !verbose then if !verbose then
if !config_name <> "" then if !config_name <> "" then
Printf.printf "Reading config file %s" !config_name Printf.eprintf "Reading config file %s" !config_name
else 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; end;
if !config_name <> "" then if !config_name <> "" then
try try
@ -115,24 +115,21 @@ let () =
let m = parse_config config C.empty in let m = parse_config config C.empty in
print_config m; print_config m;
close_in config 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 else if !arch <> "" && !flavour <> "" then
try try
let dir = if !archindir then Filename.dirname !basedir else !basedir in let dir = if !archindir then Filename.dirname !basedir else !basedir in
let m = parse_config_file (dir ^ "/config") C.empty false in let m = parse_config_file (dir ^ "/config") C.empty false in
let archdir = dir ^ "/" ^ !arch in let archdir = dir ^ "/" ^ !arch in
let m = parse_config_file (archdir ^ "/config") m false 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 = let m, archdir =
if !subarch <> "" && !subarch <> "none" then 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 let archdir = archdir ^ "/" ^ !subarch in
parse_config_file (archdir ^ "/config") m false, archdir parse_config_file (archdir ^ "/config") m false, archdir
else m, archdir else m, archdir
in 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 let m = parse_config_file (archdir ^ "/config." ^ !flavour) m true in
print_config m; print_config m;
with Sys_error s -> Printf.printf "Error: %s\n" s with Sys_error s -> Printf.eprintf "Error: %s\n" s
else else
usage () usage ()

2
debian/rules.real vendored
View File

@ -93,7 +93,7 @@ ifneq ($(SUBARCH),none)
endif endif
$(BUILD_DIR)/config.$(ARCH)-$(SUBARCH)-$(FLAVOUR): $(basedir)/config.$(FLAVOUR) $(config_common) $(BUILD_DIR)/config.$(ARCH)-$(SUBARCH)-$(FLAVOUR): $(basedir)/config.$(FLAVOUR) $(config_common)
@echo "Generating configuration file $@:" @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: SOURCE_DIR=$(BUILD_DIR)/source
$(BUILD_DIR)/linux-source-$(UPSTREAM_VERSION).tar.bz2: DIR = $(BUILD_DIR)/linux-source-$(UPSTREAM_VERSION) $(BUILD_DIR)/linux-source-$(UPSTREAM_VERSION).tar.bz2: DIR = $(BUILD_DIR)/linux-source-$(UPSTREAM_VERSION)