Added kconfig.ml and now use it to generate the config files from the snipplets,
keeping more specific options over more generic ones. Build-depend on k-p 10.028 or higher. svn path=/dists/trunk/linux-2.6/; revision=5144
This commit is contained in:
Sven Luther
parent
60f0a3c800
commit
5dca9980fa
|
|
@ -0,0 +1,138 @@
|
|||
#!/usr/bin/ocamlrun /usr/bin/ocaml
|
||||
|
||||
let basedir = ref "debian/arch"
|
||||
let arch = ref ""
|
||||
let subarch = ref ""
|
||||
let flavour = ref ""
|
||||
let config_name = ref ""
|
||||
let verbose = ref false
|
||||
let archindir = ref false
|
||||
|
||||
let spec = [
|
||||
"-b", Arg.Set_string basedir, "base dir of the arch configurations [default: debian/arch]";
|
||||
"-ba", Arg.Set archindir, "basedir includes arch";
|
||||
"-a", Arg.Set_string arch, "arch";
|
||||
"-s", Arg.Set_string subarch, "subarch";
|
||||
"-f", Arg.Set_string flavour, "flavour";
|
||||
"-v", Arg.Set verbose, "verbose";
|
||||
]
|
||||
let usage =
|
||||
"./kconfig.ml [ -b basedir ] -a arch [ -s subarch ] -f flavour" ^ "\n" ^
|
||||
"./kconfig.ml config_file"
|
||||
|
||||
let () = Arg.parse
|
||||
spec
|
||||
(function s -> config_name := s)
|
||||
usage
|
||||
|
||||
let usage () = Arg.usage spec usage
|
||||
|
||||
type options =
|
||||
| Config_Yes of string
|
||||
| Config_No of string
|
||||
| Config_Module of string
|
||||
| Config_Value of string * string
|
||||
| Config_Comment of string
|
||||
| Config_Empty
|
||||
|
||||
let print_option = function
|
||||
| Config_Yes s -> Printf.printf "CONFIG_%s=y\n" s
|
||||
| Config_No s -> Printf.printf "# CONFIG_%s is not set\n" s
|
||||
| Config_Module s -> Printf.printf "CONFIG_%s=m\n" s
|
||||
| Config_Value (s,v) -> Printf.printf "CONFIG_%s=%s\n" s v
|
||||
| Config_Comment s -> Printf.printf "#%s\n" s
|
||||
| Config_Empty -> Printf.printf "\n"
|
||||
|
||||
exception Comment
|
||||
|
||||
let parse_line fd =
|
||||
let line = input_line fd in
|
||||
let len = String.length line in
|
||||
if len = 0 then Config_Empty else
|
||||
try
|
||||
if len <= 9 then raise Comment else
|
||||
match line.[0], line.[1], line.[2], line.[3], line.[4], line.[5], line.[6], line.[7], line.[8] with
|
||||
| '#', ' ', 'C', 'O', 'N', 'F', 'I', 'G', '_' ->
|
||||
begin
|
||||
try
|
||||
let space = String.index_from line 8 ' ' in
|
||||
if String.sub line (space + 1) 10 = "is not set" then
|
||||
let o = String.sub line 9 (space - 9) in
|
||||
Config_No o
|
||||
else raise Comment
|
||||
with Not_found | Invalid_argument "String.sub" -> raise Comment
|
||||
end
|
||||
| '#', _, _, _, _, _, _, _, _ -> raise Comment
|
||||
| 'C', 'O', 'N', 'F', 'I', 'G', _, _, _ ->
|
||||
begin
|
||||
try
|
||||
let equal = String.index_from line 6 '=' in
|
||||
let o = String.sub line 7 (equal - 7) in
|
||||
let v = String.sub line (equal + 1) (len - equal - 1) in
|
||||
match v with
|
||||
| "y" -> Config_Yes o
|
||||
| "m" -> Config_Module o
|
||||
| _ -> Config_Value (o,v)
|
||||
with Not_found | Invalid_argument "String.sub" -> raise Comment
|
||||
end
|
||||
| _ -> raise Comment
|
||||
with Comment -> Config_Comment (String.sub line 1 (len - 1))
|
||||
|
||||
module C = Map.Make (String)
|
||||
|
||||
(* Map.add behavior ensures the latest entry is the one staying *)
|
||||
let rec parse_config fd m =
|
||||
try
|
||||
let line = parse_line fd in
|
||||
match line with
|
||||
| Config_Comment _ | Config_Empty -> parse_config fd m
|
||||
| Config_Yes s | Config_No s | Config_Module s | Config_Value (s,_) ->
|
||||
parse_config fd (C.add s line m)
|
||||
with End_of_file -> m
|
||||
|
||||
let print_config m = C.iter (function _ -> print_option) m
|
||||
|
||||
let parse_config_file name m force =
|
||||
try
|
||||
let config = open_in name in
|
||||
let m = parse_config config m in
|
||||
close_in config;
|
||||
m
|
||||
with Sys_error s ->
|
||||
if force then raise (Sys_error s) else m
|
||||
|
||||
let () =
|
||||
begin
|
||||
if !verbose then
|
||||
if !config_name <> "" then
|
||||
Printf.printf "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
|
||||
end;
|
||||
if !config_name <> "" then
|
||||
try
|
||||
let config = open_in !config_name in
|
||||
let m = parse_config config C.empty in
|
||||
print_config m;
|
||||
close_in config
|
||||
with Sys_error s -> Printf.printf "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
|
||||
else
|
||||
usage ()
|
||||
|
|
@ -44,6 +44,12 @@ linux-2.6 (2.6.14+2.6.15-rc7-0experimental.1) UNRELEASED; urgency=low
|
|||
* [powerpc] Fixed apus patch for 2.6.15-rc7 (and beyond hopefully).
|
||||
* [powerpc] Fixed config options, but i guess jonas broke it again with his
|
||||
cleanup, oh well :)
|
||||
* Added debian/bin/kconfig.ml to process config file snipplet, so we can
|
||||
preserve the pre 2.6.15 ordering of config file snipplets. Upto 2.6.15
|
||||
the kernel Kconfig magic apparently kept the later occuring config options,
|
||||
but it seems that this is no more the case. Instead of catting the config
|
||||
files together, not use the kconfig.ml script to read in the files from
|
||||
more generic to more specific, and keep only the more specific.
|
||||
|
||||
[ Jurij Smakov ]
|
||||
* [sparc] Correct the patch for the atyfb framebuffer driver
|
||||
|
|
|
|||
|
|
@ -93,14 +93,7 @@ ifneq ($(SUBARCH),none)
|
|||
endif
|
||||
$(BUILD_DIR)/config.$(ARCH)-$(SUBARCH)-$(FLAVOUR): $(basedir)/config.$(FLAVOUR) $(config_common)
|
||||
@echo "Generating configuration file $@:"
|
||||
rm -f '$@'
|
||||
for i in $(config_common); do \
|
||||
if [ -f "$${i}" ]; then \
|
||||
cat "$${i}" >> '$@'; \
|
||||
fi; \
|
||||
done
|
||||
# Flavour config file must be present
|
||||
cat '$(basedir)/config.$(FLAVOUR)' >> '$@'
|
||||
debian/bin/kconfig.ml -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)
|
||||
|
|
|
|||
|
|
@ -4,5 +4,5 @@ Priority: optional
|
|||
Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>
|
||||
Uploaders: Andres Salomon <dilinger@debian.org>, Bastian Blank <waldi@debian.org>, Simon Horman <horms@debian.org>, Sven Luther <luther@debian.org>, Jonas Smedegaard <dr@jones.dk>, Norbert Tretkowski <nobse@debian.org>, Frederik Schüler <fs@debian.org>
|
||||
Standards-Version: 3.6.1.0
|
||||
Build-Depends: gcc (>= 4:4.0) [!m68k], gcc-3.3 [m68k], binutils-hppa64 [hppa], gcc-4.0-hppa64 [hppa], debhelper (>= 4.1.0), module-init-tools, dpkg-dev (>= 1.10.23), debianutils (>= 1.6), bzip2, sparc-utils [sparc], kernel-package (>= 9.008.3)
|
||||
Build-Depends: gcc (>= 4:4.0) [!m68k], gcc-3.3 [m68k], binutils-hppa64 [hppa], gcc-4.0-hppa64 [hppa], debhelper (>= 4.1.0), module-init-tools, dpkg-dev (>= 1.10.23), debianutils (>= 1.6), bzip2, sparc-utils [sparc], kernel-package (>= 10.028), ocaml-interp
|
||||
Build-Depends-Indep: docbook-utils, gs, transfig, xmlto, dh-kpatches (>= 0.99.3)
|
||||
|
|
|
|||
Loading…
Reference in New Issue