* [Buildroot] svn commit: trunk/buildroot/package/config
@ 2008-12-13 11:52 jacmet at uclibc.org
0 siblings, 0 replies; 24+ messages in thread
From: jacmet at uclibc.org @ 2008-12-13 11:52 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-12-13 03:52:54 -0800 (Sat, 13 Dec 2008)
New Revision: 24403
Log:
menuconfig: don't prepend CONFIG_ to symbols in help text
Modified:
trunk/buildroot/package/config/mconf.c
Changeset:
Modified: trunk/buildroot/package/config/mconf.c
===================================================================
--- trunk/buildroot/package/config/mconf.c 2008-12-13 11:01:21 UTC (rev 24402)
+++ trunk/buildroot/package/config/mconf.c 2008-12-13 11:52:54 UTC (rev 24403)
@@ -743,7 +743,7 @@
if (menu_has_help(menu))
{
if (sym->name) {
- str_printf(&help, "CONFIG_%s:\n\n", sym->name);
+ str_printf(&help, "%s:\n\n", sym->name);
str_append(&help, _(menu_get_help(menu)));
str_append(&help, "\n");
}
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/config
@ 2008-10-16 19:28 jacmet at uclibc.org
0 siblings, 0 replies; 24+ messages in thread
From: jacmet at uclibc.org @ 2008-10-16 19:28 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-10-16 12:28:23 -0700 (Thu, 16 Oct 2008)
New Revision: 23697
Log:
kconfig: only warn about long help lines, not other types of lines
We have some pretty long depends / default y|n lines in BR, which it
shouldn't complain about.
Modified:
trunk/buildroot/package/config/lex.zconf.c_shipped
trunk/buildroot/package/config/zconf.l
Changeset:
Modified: trunk/buildroot/package/config/lex.zconf.c_shipped
===================================================================
--- trunk/buildroot/package/config/lex.zconf.c_shipped 2008-10-16 13:29:13 UTC (rev 23696)
+++ trunk/buildroot/package/config/lex.zconf.c_shipped 2008-10-16 19:28:23 UTC (rev 23697)
@@ -815,7 +815,8 @@
void append_string(const char *str, int size)
{
int new_size = text_size + size + 1;
- if (size > 70) {
+
+ if ((YY_START == 2 /* HELP */) && (size > 70)) {
fprintf (stderr, "%s:%d warning: Overlong line\n",
current_file->name, current_file->lineno);
}
Modified: trunk/buildroot/package/config/zconf.l
===================================================================
--- trunk/buildroot/package/config/zconf.l 2008-10-16 13:29:13 UTC (rev 23696)
+++ trunk/buildroot/package/config/zconf.l 2008-10-16 19:28:23 UTC (rev 23697)
@@ -49,7 +49,8 @@
void append_string(const char *str, int size)
{
int new_size = text_size + size + 1;
- if (size > 70) {
+
+ if ((YY_START == 2 /* HELP */) && (size > 70)) {
fprintf (stderr, "%s:%d warning: Overlong line\n",
current_file->name, current_file->lineno);
}
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/config
@ 2008-08-27 20:18 jacmet at uclibc.org
0 siblings, 0 replies; 24+ messages in thread
From: jacmet at uclibc.org @ 2008-08-27 20:18 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-08-27 13:18:33 -0700 (Wed, 27 Aug 2008)
New Revision: 23247
Log:
kconfig: warn about overlong lines in help-texts
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/config
2008-06-19 18:18 ` Fathi Boudra
@ 2008-06-19 19:07 ` Peter Korsgaard
0 siblings, 0 replies; 24+ messages in thread
From: Peter Korsgaard @ 2008-06-19 19:07 UTC (permalink / raw)
To: buildroot
>>>>> "Fathi" == Fathi Boudra <fboudra@gmail.com> writes:
Hi,
Fathi> missing check.sh. You can take it from bernhard git repos.
Fathi> Then you need to use "depends on" instead on "depends".
Fathi> I guess it will be fixed soon on svn repo.
Yes, sorry about that.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/config
2008-06-19 16:44 ` hartleys
2008-06-19 18:18 ` Fathi Boudra
@ 2008-06-19 19:06 ` Peter Korsgaard
1 sibling, 0 replies; 24+ messages in thread
From: Peter Korsgaard @ 2008-06-19 19:06 UTC (permalink / raw)
To: buildroot
>>>>> "hartleys" == hartleys <hartleys@visionengravers.com> writes:
Hi,
hartleys> Hello all,
hartleys> I just did an svn up for the latest revision of buildroot
hartleys> (22451). It appears something is either broke or I'm
hartleys> missing something.
Sorry, my fault - I seems like I didn't get package/config cleaned up
correctly before committing the kbuild updates, so I didn't see the
problem.
There were two issues: check.sh was missing and the new kbuild is
stricter, so I had to fixup depends BLAH -> depends on BLAH.
It should be fixed from r22455 on (remember to clean your
package/config directory).
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/config
@ 2008-06-19 19:06 jacmet at uclibc.org
0 siblings, 0 replies; 24+ messages in thread
From: jacmet at uclibc.org @ 2008-06-19 19:06 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-06-19 12:06:08 -0700 (Thu, 19 Jun 2008)
New Revision: 22454
Log:
package/config: add gettext helper
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/config
2008-06-19 16:44 ` hartleys
@ 2008-06-19 18:18 ` Fathi Boudra
2008-06-19 19:07 ` Peter Korsgaard
2008-06-19 19:06 ` Peter Korsgaard
1 sibling, 1 reply; 24+ messages in thread
From: Fathi Boudra @ 2008-06-19 18:18 UTC (permalink / raw)
To: buildroot
Hi,
> bigguiness at etch:~/src/build/buildroot$ make menuconfig
> make CC="/usr/bin/gcc" -C package/config conf mconf
> /bin/sh: ././check.sh: No such file or directory
missing check.sh. You can take it from bernhard git repos.
Then you need to use "depends on" instead on "depends".
I guess it will be fixed soon on svn repo.
cheers,
Fathi
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/config
2008-06-19 8:11 jacmet at uclibc.org
@ 2008-06-19 16:44 ` hartleys
2008-06-19 18:18 ` Fathi Boudra
2008-06-19 19:06 ` Peter Korsgaard
0 siblings, 2 replies; 24+ messages in thread
From: hartleys @ 2008-06-19 16:44 UTC (permalink / raw)
To: buildroot
Hello all,
I just did an svn up for the latest revision of buildroot (22451). It
appears something is either broke or I'm missing something.
I also tried a new svn co and have the same problem. With the new svn co
when I try a make menuconfig I get the following:
bigguiness at etch:~/src/build/buildroot$ make menuconfig
make CC="/usr/bin/gcc" -C package/config conf mconf
/bin/sh: ././check.sh: No such file or directory
make[1]: Entering directory
`/home/bigguiness/src/build/buildroot/package/config'
/usr/bin/gcc -DCURSES_LOC="<ncurses.h>" -DLOCALE -g -O2 -MM *.c >
.depend 2>/dev/null || :
make[1]: Leaving directory
`/home/bigguiness/src/build/buildroot/package/config'/bin/sh:
././check.sh: No such file or directory
make[1]: Entering directory
`/home/bigguiness/src/build/buildroot/package/config'
/usr/bin/gcc -DCURSES_LOC="<ncurses.h>" -DLOCALE -g -O2 -c conf.c -o
conf.o
/bin/sh: ././check.sh: No such file or directory
/usr/bin/gcc -DCURSES_LOC="<ncurses.h>" -DLOCALE -g -O2 -c kxgettext.c
-o kxgettext.o
/bin/sh: ././check.sh: No such file or directory
/usr/bin/gcc -DCURSES_LOC="<ncurses.h>" -DLOCALE -g -O2 -c
lxdialog/checklist.c -o lxdialog/checklist.o
/bin/sh: ././check.sh: No such file or directory
/usr/bin/gcc -DCURSES_LOC="<ncurses.h>" -DLOCALE -g -O2 -c
lxdialog/inputbox.c -o lxdialog/inputbox.o
/bin/sh: ././check.sh: No such file or directory
/usr/bin/gcc -DCURSES_LOC="<ncurses.h>" -DLOCALE -g -O2 -c
lxdialog/menubox.c -o lxdialog/menubox.o
/bin/sh: ././check.sh: No such file or directory
/usr/bin/gcc -DCURSES_LOC="<ncurses.h>" -DLOCALE -g -O2 -c
lxdialog/textbox.c -o lxdialog/textbox.o
/bin/sh: ././check.sh: No such file or directory
/usr/bin/gcc -DCURSES_LOC="<ncurses.h>" -DLOCALE -g -O2 -c
lxdialog/util.c -o lxdialog/util.o
/bin/sh: ././check.sh: No such file or directory
/usr/bin/gcc -DCURSES_LOC="<ncurses.h>" -DLOCALE -g -O2 -c
lxdialog/yesno.c -o lxdialog/yesno.o
/bin/sh: ././check.sh: No such file or directory
/usr/bin/gcc -DCURSES_LOC="<ncurses.h>" -DLOCALE -g -O2 -c mconf.c -o
mconf.o
/bin/sh: ././check.sh: No such file or directory
/usr/bin/gcc -DCURSES_LOC="<ncurses.h>" -DLOCALE -g -O2 -I. -c
zconf.tab.c -o zconf.tab.o
/bin/sh: ././check.sh: No such file or directory
/usr/bin/gcc -DCURSES_LOC="<ncurses.h>" -DLOCALE -g -O2 conf.o
zconf.tab.o -lncursesw -o conf
/bin/sh: ././check.sh: No such file or directory
/usr/bin/gcc -DCURSES_LOC="<ncurses.h>" -DLOCALE -g -O2 mconf.o
zconf.tab.o lxdialog/checklist.o lxdialog/util.o lxdialog/inputbox.o
lxdialog/textbox.o lxdialog/yesno.o lxdialog/menubox.o -lncursesw -o
mconf
make[1]: Leaving directory
`/home/bigguiness/src/build/buildroot/package/config'
target/Config.in.arch:55: invalid option
target/Config.in.arch:115: invalid option
target/Config.in.arch:128: invalid option
target/Config.in.arch:160: invalid option
target/Config.in.arch:170: invalid option
target/Config.in.arch:173: invalid option
target/Config.in.arch:176: invalid option
...
others 'invalid option' messages follow then the make ends
How can I either fix this or is it possible to revert the svn back to an
older revision?
Thanks,
Hartley
-----Original Message-----
From: buildroot-bounces@uclibc.org [mailto:buildroot-bounces at uclibc.org]
On Behalf Of jacmet at uclibc.org
Sent: Thursday, June 19, 2008 1:12 AM
To: buildroot at uclibc.org
Subject: [Buildroot] svn commit: trunk/buildroot/package/config
Author: jacmet
Date: 2008-06-19 01:11:51 -0700 (Thu, 19 Jun 2008) New Revision: 22451
Log:
package/config: rebase from upstream (2.6.24.4)
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/config
@ 2008-06-19 8:11 jacmet at uclibc.org
2008-06-19 16:44 ` hartleys
0 siblings, 1 reply; 24+ messages in thread
From: jacmet at uclibc.org @ 2008-06-19 8:11 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-06-19 01:11:51 -0700 (Thu, 19 Jun 2008)
New Revision: 22451
Log:
package/config: rebase from upstream (2.6.24.4)
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/config
@ 2007-09-29 20:21 aldot at uclibc.org
0 siblings, 0 replies; 24+ messages in thread
From: aldot at uclibc.org @ 2007-09-29 20:21 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-09-29 13:21:38 -0700 (Sat, 29 Sep 2007)
New Revision: 20125
Log:
- pull "kconfig: oldconfig shall not set symbols if it does not need to"
Modified:
trunk/buildroot/package/config/conf.c
Changeset:
Modified: trunk/buildroot/package/config/conf.c
===================================================================
--- trunk/buildroot/package/config/conf.c 2007-09-29 20:08:22 UTC (rev 20124)
+++ trunk/buildroot/package/config/conf.c 2007-09-29 20:21:38 UTC (rev 20125)
@@ -64,7 +64,7 @@
}
}
-static void conf_askvalue(struct symbol *sym, const char *def)
+static int conf_askvalue(struct symbol *sym, const char *def)
{
enum symbol_type type = sym_get_type(sym);
tristate val;
@@ -79,7 +79,7 @@
printf("%s\n", def);
line[0] = '\n';
line[1] = 0;
- return;
+ return 0;
}
switch (input_mode) {
@@ -89,23 +89,23 @@
case set_random:
if (sym_has_value(sym)) {
printf("%s\n", def);
- return;
+ return 0;
}
break;
case ask_new:
case ask_silent:
if (sym_has_value(sym)) {
printf("%s\n", def);
- return;
+ return 0;
}
check_stdin();
case ask_all:
fflush(stdout);
fgets(line, 128, stdin);
- return;
+ return 1;
case set_default:
printf("%s\n", def);
- return;
+ return 1;
default:
break;
}
@@ -115,7 +115,7 @@
case S_HEX:
case S_STRING:
printf("%s\n", def);
- return;
+ return 1;
default:
;
}
@@ -166,6 +166,7 @@
break;
}
printf("%s", line);
+ return 1;
}
int conf_string(struct menu *menu)
@@ -179,7 +180,8 @@
def = sym_get_string_value(sym);
if (sym_get_string_value(sym))
printf("[%s] ", def);
- conf_askvalue(sym, def);
+ if (!conf_askvalue(sym, def))
+ return 0;
switch (line[0]) {
case '\n':
break;
@@ -236,7 +238,8 @@
if (sym->help)
printf("/?");
printf("] ");
- conf_askvalue(sym, sym_get_string_value(sym));
+ if (!conf_askvalue(sym, sym_get_string_value(sym)))
+ return 0;
strip(line);
switch (line[0]) {
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/config
@ 2007-09-29 20:08 aldot at uclibc.org
0 siblings, 0 replies; 24+ messages in thread
From: aldot at uclibc.org @ 2007-09-29 20:08 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-09-29 13:08:22 -0700 (Sat, 29 Sep 2007)
New Revision: 20124
Log:
- forgot to svn add kconfig-language.txt
Added:
trunk/buildroot/package/config/kconfig-language.txt
Changeset:
Added: trunk/buildroot/package/config/kconfig-language.txt
===================================================================
--- trunk/buildroot/package/config/kconfig-language.txt (rev 0)
+++ trunk/buildroot/package/config/kconfig-language.txt 2007-09-29 20:08:22 UTC (rev 20124)
@@ -0,0 +1,282 @@
+Introduction
+------------
+
+The configuration database is a collection of configuration options
+organized in a tree structure:
+
+ +- Code maturity level options
+ | +- Prompt for development and/or incomplete code/drivers
+ +- General setup
+ | +- Networking support
+ | +- System V IPC
+ | +- BSD Process Accounting
+ | +- Sysctl support
+ +- Loadable module support
+ | +- Enable loadable module support
+ | +- Set version information on all module symbols
+ | +- Kernel module loader
+ +- ...
+
+Every entry has its own dependencies. These dependencies are used
+to determine the visibility of an entry. Any child entry is only
+visible if its parent entry is also visible.
+
+Menu entries
+------------
+
+Most entries define a config option, all other entries help to organize
+them. A single configuration option is defined like this:
+
+config MODVERSIONS
+ bool "Set version information on all module symbols"
+ depends on MODULES
+ help
+ Usually, modules have to be recompiled whenever you switch to a new
+ kernel. ...
+
+Every line starts with a key word and can be followed by multiple
+arguments. "config" starts a new config entry. The following lines
+define attributes for this config option. Attributes can be the type of
+the config option, input prompt, dependencies, help text and default
+values. A config option can be defined multiple times with the same
+name, but every definition can have only a single input prompt and the
+type must not conflict.
+
+Menu attributes
+---------------
+
+A menu entry can have a number of attributes. Not all of them are
+applicable everywhere (see syntax).
+
+- type definition: "bool"/"tristate"/"string"/"hex"/"int"
+ Every config option must have a type. There are only two basic types:
+ tristate and string, the other types are based on these two. The type
+ definition optionally accepts an input prompt, so these two examples
+ are equivalent:
+
+ bool "Networking support"
+ and
+ bool
+ prompt "Networking support"
+
+- input prompt: "prompt" <prompt> ["if" <expr>]
+ Every menu entry can have at most one prompt, which is used to display
+ to the user. Optionally dependencies only for this prompt can be added
+ with "if".
+
+- default value: "default" <expr> ["if" <expr>]
+ A config option can have any number of default values. If multiple
+ default values are visible, only the first defined one is active.
+ Default values are not limited to the menu entry where they are
+ defined. This means the default can be defined somewhere else or be
+ overridden by an earlier definition.
+ The default value is only assigned to the config symbol if no other
+ value was set by the user (via the input prompt above). If an input
+ prompt is visible the default value is presented to the user and can
+ be overridden by him.
+ Optionally, dependencies only for this default value can be added with
+ "if".
+
+- dependencies: "depends on"/"requires" <expr>
+ This defines a dependency for this menu entry. If multiple
+ dependencies are defined, they are connected with '&&'. Dependencies
+ are applied to all other options within this menu entry (which also
+ accept an "if" expression), so these two examples are equivalent:
+
+ bool "foo" if BAR
+ default y if BAR
+ and
+ depends on BAR
+ bool "foo"
+ default y
+
+- reverse dependencies: "select" <symbol> ["if" <expr>]
+ While normal dependencies reduce the upper limit of a symbol (see
+ below), reverse dependencies can be used to force a lower limit of
+ another symbol. The value of the current menu symbol is used as the
+ minimal value <symbol> can be set to. If <symbol> is selected multiple
+ times, the limit is set to the largest selection.
+ Reverse dependencies can only be used with boolean or tristate
+ symbols.
+
+- numerical ranges: "range" <symbol> <symbol> ["if" <expr>]
+ This allows to limit the range of possible input values for int
+ and hex symbols. The user can only input a value which is larger than
+ or equal to the first symbol and smaller than or equal to the second
+ symbol.
+
+- help text: "help" or "---help---"
+ This defines a help text. The end of the help text is determined by
+ the indentation level, this means it ends at the first line which has
+ a smaller indentation than the first line of the help text.
+ "---help---" and "help" do not differ in behaviour, "---help---" is
+ used to help visually separate configuration logic from help within
+ the file as an aid to developers.
+
+
+Menu dependencies
+-----------------
+
+Dependencies define the visibility of a menu entry and can also reduce
+the input range of tristate symbols. The tristate logic used in the
+expressions uses one more state than normal boolean logic to express the
+module state. Dependency expressions have the following syntax:
+
+<expr> ::= <symbol> (1)
+ <symbol> '=' <symbol> (2)
+ <symbol> '!=' <symbol> (3)
+ '(' <expr> ')' (4)
+ '!' <expr> (5)
+ <expr> '&&' <expr> (6)
+ <expr> '||' <expr> (7)
+
+Expressions are listed in decreasing order of precedence.
+
+(1) Convert the symbol into an expression. Boolean and tristate symbols
+ are simply converted into the respective expression values. All
+ other symbol types result in 'n'.
+(2) If the values of both symbols are equal, it returns 'y',
+ otherwise 'n'.
+(3) If the values of both symbols are equal, it returns 'n',
+ otherwise 'y'.
+(4) Returns the value of the expression. Used to override precedence.
+(5) Returns the result of (2-/expr/).
+(6) Returns the result of min(/expr/, /expr/).
+(7) Returns the result of max(/expr/, /expr/).
+
+An expression can have a value of 'n', 'm' or 'y' (or 0, 1, 2
+respectively for calculations). A menu entry becomes visible when it's
+expression evaluates to 'm' or 'y'.
+
+There are two types of symbols: constant and nonconstant symbols.
+Nonconstant symbols are the most common ones and are defined with the
+'config' statement. Nonconstant symbols consist entirely of alphanumeric
+characters or underscores.
+Constant symbols are only part of expressions. Constant symbols are
+always surrounded by single or double quotes. Within the quote, any
+other character is allowed and the quotes can be escaped using '\'.
+
+Menu structure
+--------------
+
+The position of a menu entry in the tree is determined in two ways. First
+it can be specified explicitly:
+
+menu "Network device support"
+ depends on NET
+
+config NETDEVICES
+ ...
+
+endmenu
+
+All entries within the "menu" ... "endmenu" block become a submenu of
+"Network device support". All subentries inherit the dependencies from
+the menu entry, e.g. this means the dependency "NET" is added to the
+dependency list of the config option NETDEVICES.
+
+The other way to generate the menu structure is done by analyzing the
+dependencies. If a menu entry somehow depends on the previous entry, it
+can be made a submenu of it. First, the previous (parent) symbol must
+be part of the dependency list and then one of these two conditions
+must be true:
+- the child entry must become invisible, if the parent is set to 'n'
+- the child entry must only be visible, if the parent is visible
+
+config MODULES
+ bool "Enable loadable module support"
+
+config MODVERSIONS
+ bool "Set version information on all module symbols"
+ depends on MODULES
+
+comment "module support disabled"
+ depends on !MODULES
+
+MODVERSIONS directly depends on MODULES, this means it's only visible if
+MODULES is different from 'n'. The comment on the other hand is always
+visible when MODULES is visible (the (empty) dependency of MODULES is
+also part of the comment dependencies).
+
+
+Kconfig syntax
+--------------
+
+The configuration file describes a series of menu entries, where every
+line starts with a keyword (except help texts). The following keywords
+end a menu entry:
+- config
+- menuconfig
+- choice/endchoice
+- comment
+- menu/endmenu
+- if/endif
+- source
+The first five also start the definition of a menu entry.
+
+config:
+
+ "config" <symbol>
+ <config options>
+
+This defines a config symbol <symbol> and accepts any of above
+attributes as options.
+
+menuconfig:
+ "menuconfig" <symbol>
+ <config options>
+
+This is similar to the simple config entry above, but it also gives a
+hint to front ends, that all suboptions should be displayed as a
+separate list of options.
+
+choices:
+
+ "choice"
+ <choice options>
+ <choice block>
+ "endchoice"
+
+This defines a choice group and accepts any of the above attributes as
+options. A choice can only be of type bool or tristate, while a boolean
+choice only allows a single config entry to be selected, a tristate
+choice also allows any number of config entries to be set to 'm'. This
+can be used if multiple drivers for a single hardware exists and only a
+single driver can be compiled/loaded into the kernel, but all drivers
+can be compiled as modules.
+A choice accepts another option "optional", which allows to set the
+choice to 'n' and no entry needs to be selected.
+
+comment:
+
+ "comment" <prompt>
+ <comment options>
+
+This defines a comment which is displayed to the user during the
+configuration process and is also echoed to the output files. The only
+possible options are dependencies.
+
+menu:
+
+ "menu" <prompt>
+ <menu options>
+ <menu block>
+ "endmenu"
+
+This defines a menu block, see "Menu structure" above for more
+information. The only possible options are dependencies.
+
+if:
+
+ "if" <expr>
+ <if block>
+ "endif"
+
+This defines an if block. The dependency expression <expr> is appended
+to all enclosed menu entries.
+
+source:
+
+ "source" <prompt>
+
+This reads the specified configuration file. This file is always parsed.
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/config
@ 2007-09-23 20:46 aldot at uclibc.org
0 siblings, 0 replies; 24+ messages in thread
From: aldot at uclibc.org @ 2007-09-23 20:46 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-09-23 13:46:44 -0700 (Sun, 23 Sep 2007)
New Revision: 19979
Log:
- add the $(BASE_TARGETS) per default
Modified:
trunk/buildroot/package/config/kconfig-to-buildroot2.patch
trunk/buildroot/package/config/util.c
Changeset:
Modified: trunk/buildroot/package/config/kconfig-to-buildroot2.patch
===================================================================
--- trunk/buildroot/package/config/kconfig-to-buildroot2.patch 2007-09-23 20:28:53 UTC (rev 19978)
+++ trunk/buildroot/package/config/kconfig-to-buildroot2.patch 2007-09-23 20:46:44 UTC (rev 19979)
@@ -1369,7 +1369,7 @@
+ e = p->expr;
+ if (e && e->left.sym->name) {
+ if (!done) {
-+ fprintf(out, "%s:", br2_symbol_printer(sym->name));
++ fprintf(out, "%s: $(BASE_TARGETS)", br2_symbol_printer(sym->name));
+ done = 1;
+ }
+//printf("SELECTS %s\n",e->left.sym->name);
Modified: trunk/buildroot/package/config/util.c
===================================================================
--- trunk/buildroot/package/config/util.c 2007-09-23 20:28:53 UTC (rev 19978)
+++ trunk/buildroot/package/config/util.c 2007-09-23 20:46:44 UTC (rev 19979)
@@ -84,7 +84,7 @@
e = p->expr;
if (e && e->left.sym->name) {
if (!done) {
- fprintf(out, "%s:", br2_symbol_printer(sym->name));
+ fprintf(out, "%s: $(BASE_TARGETS)", br2_symbol_printer(sym->name));
done = 1;
}
//printf("SELECTS %s\n",e->left.sym->name);
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/config
@ 2007-09-23 20:28 aldot at uclibc.org
0 siblings, 0 replies; 24+ messages in thread
From: aldot at uclibc.org @ 2007-09-23 20:28 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-09-23 13:28:53 -0700 (Sun, 23 Sep 2007)
New Revision: 19978
Log:
- thinking loud about auto-generating dependencies for make(1)
Don't use this, it doesn't work yet. Thoughs welcome.
Like: We should probably use the sym->text and not fiddle with the name since
the name looses information ('_' != '-' in host-fakeroot). This would not
be too robust, i fear, since the name can contain additional, arbitrary info.
Also, the real 'depends' are a little bit ugly in kconfig. There doesn't seem
to be a nice property that holds reverse deps that are only contain selected
symbols.
Thoughts?
Modified:
trunk/buildroot/package/config/kconfig-to-buildroot2.patch
trunk/buildroot/package/config/util.c
Changeset:
Modified: trunk/buildroot/package/config/kconfig-to-buildroot2.patch
===================================================================
--- trunk/buildroot/package/config/kconfig-to-buildroot2.patch 2007-09-23 18:34:49 UTC (rev 19977)
+++ trunk/buildroot/package/config/kconfig-to-buildroot2.patch 2007-09-23 20:28:53 UTC (rev 19978)
@@ -1303,3 +1303,127 @@
return name ? name : ".config";
}
+Index: util.c
+===================================================================
+--- kernel-config/util.c (revision 19969)
++++ config/util.c (working copy)
+@@ -26,6 +26,109 @@ struct file *file_lookup(const char *nam
+ return file;
+ }
+
++static char* br2_symbol_printer(const char * const in)
++{
++ ssize_t i, j, len = strlen(in);
++ char *ret;
++ if (len < 1)
++ return NULL;
++ ret = malloc(len);
++ if (!ret) {
++ printf("Out of memory!");
++ exit(1);
++ }
++ memset(ret, 0, len);
++ i = j = 0;
++ if (strncmp("BR2_", in, 4) == 0)
++ i += 4;
++ if (strncmp("PACKAGE_", in + i, 8) == 0)
++ i += 8;
++ else if (strncmp("TARGET_", in + i, 7) == 0)
++ i += 7;
++ while (i <= len)
++ ret[j++] = tolower(in[i++]);
++ return ret;
++}
++
++/* write dependencies of the infividual config-symbols */
++static int write_make_deps(const char *name)
++{
++ struct menu *menu;
++ struct symbol *sym;
++ struct property *prop, *p;
++ unsigned done;
++ const char * const name_tmp = "..make.deps.tmp";
++ FILE *out;
++ if (!name)
++ name = ".auto.deps";
++ out = fopen(name_tmp, "w");
++ if (!out)
++ return 1;
++ fprintf(out, "# ATTENTION! This does not handle 'depends', just 'select'! \n"
++ "# See package/config/util.c write_make_deps()\n#\n");
++ menu = &rootmenu;//rootmenu.list;
++ while (menu) {
++ sym = menu->sym;
++ if (!sym) {
++ if (!menu_is_visible(menu))
++ goto next;
++ } else if (!(sym->flags & SYMBOL_CHOICE)) {
++ sym_calc_value(sym);
++ if (sym->type == S_BOOLEAN
++ && sym_get_tristate_value(sym) != no) {
++ done = 0;
++ for_all_prompts(sym, prop) {
++ struct expr *e;
++//printf("\nname=%s\n", sym->name);
++ for_all_properties(sym, p, P_SELECT) {
++ e = p->expr;
++ if (e && e->left.sym->name) {
++ if (!done) {
++ fprintf(out, "%s:", br2_symbol_printer(sym->name));
++ done = 1;
++ }
++//printf("SELECTS %s\n",e->left.sym->name);
++ fprintf(out, " %s",br2_symbol_printer(e->left.sym->name));
++ }
++ }
++ if (done)
++ fprintf(out, "\n");
++#if 0
++ e = sym->rev_dep.expr;
++ if (e && e->type == E_SYMBOL
++ && e->left.sym->name) {
++ fprintf(out, "%s: %s", br2_symbol_printer(e->left.sym->name),
++ br2_symbol_printer(sym->name));
++printf("%s is Selected BY: %s", sym->name, e->left.sym->name);
++ }
++#endif
++ }
++ }
++ }
++next:
++ if (menu->list) {
++ menu = menu->list;
++ continue;
++ }
++ if (menu->next)
++ menu = menu->next;
++ else while ((menu = menu->parent)) {
++ if (menu->next) {
++ menu = menu->next;
++ break;
++ }
++ }
++ }
++ fclose(out);
++ rename(name_tmp, name);
++ printf(_("#\n"
++ "# make dependencies written to %s\n"
++ "# ATTENTION buildroot devels!\n"
++ "# See top of this file before playing with this auto-preprequisites!\n"
++ "#\n"), name);
++ return 0;
++}
++
+ /* write a dependency file as used by kbuild to track dependencies */
+ int file_write_dep(const char *name)
+ {
+@@ -49,7 +152,8 @@ int file_write_dep(const char *name)
+ "$(deps_config): ;\n");
+ fclose(out);
+ rename("..config.tmp", name);
+- return 0;
++
++ return write_make_deps(NULL);
+ }
+
+
Modified: trunk/buildroot/package/config/util.c
===================================================================
--- trunk/buildroot/package/config/util.c 2007-09-23 18:34:49 UTC (rev 19977)
+++ trunk/buildroot/package/config/util.c 2007-09-23 20:28:53 UTC (rev 19978)
@@ -26,6 +26,109 @@
return file;
}
+static char* br2_symbol_printer(const char * const in)
+{
+ ssize_t i, j, len = strlen(in);
+ char *ret;
+ if (len < 1)
+ return NULL;
+ ret = malloc(len);
+ if (!ret) {
+ printf("Out of memory!");
+ exit(1);
+ }
+ memset(ret, 0, len);
+ i = j = 0;
+ if (strncmp("BR2_", in, 4) == 0)
+ i += 4;
+ if (strncmp("PACKAGE_", in + i, 8) == 0)
+ i += 8;
+ else if (strncmp("TARGET_", in + i, 7) == 0)
+ i += 7;
+ while (i <= len)
+ ret[j++] = tolower(in[i++]);
+ return ret;
+}
+
+/* write dependencies of the infividual config-symbols */
+static int write_make_deps(const char *name)
+{
+ struct menu *menu;
+ struct symbol *sym;
+ struct property *prop, *p;
+ unsigned done;
+ const char * const name_tmp = "..make.deps.tmp";
+ FILE *out;
+ if (!name)
+ name = ".auto.deps";
+ out = fopen(name_tmp, "w");
+ if (!out)
+ return 1;
+ fprintf(out, "# ATTENTION! This does not handle 'depends', just 'select'! \n"
+ "# See package/config/util.c write_make_deps()\n#\n");
+ menu = &rootmenu;//rootmenu.list;
+ while (menu) {
+ sym = menu->sym;
+ if (!sym) {
+ if (!menu_is_visible(menu))
+ goto next;
+ } else if (!(sym->flags & SYMBOL_CHOICE)) {
+ sym_calc_value(sym);
+ if (sym->type == S_BOOLEAN
+ && sym_get_tristate_value(sym) != no) {
+ done = 0;
+ for_all_prompts(sym, prop) {
+ struct expr *e;
+//printf("\nname=%s\n", sym->name);
+ for_all_properties(sym, p, P_SELECT) {
+ e = p->expr;
+ if (e && e->left.sym->name) {
+ if (!done) {
+ fprintf(out, "%s:", br2_symbol_printer(sym->name));
+ done = 1;
+ }
+//printf("SELECTS %s\n",e->left.sym->name);
+ fprintf(out, " %s",br2_symbol_printer(e->left.sym->name));
+ }
+ }
+ if (done)
+ fprintf(out, "\n");
+#if 0
+ e = sym->rev_dep.expr;
+ if (e && e->type == E_SYMBOL
+ && e->left.sym->name) {
+ fprintf(out, "%s: %s", br2_symbol_printer(e->left.sym->name),
+ br2_symbol_printer(sym->name));
+printf("%s is Selected BY: %s", sym->name, e->left.sym->name);
+ }
+#endif
+ }
+ }
+ }
+next:
+ if (menu->list) {
+ menu = menu->list;
+ continue;
+ }
+ if (menu->next)
+ menu = menu->next;
+ else while ((menu = menu->parent)) {
+ if (menu->next) {
+ menu = menu->next;
+ break;
+ }
+ }
+ }
+ fclose(out);
+ rename(name_tmp, name);
+ printf(_("#\n"
+ "# make dependencies written to %s\n"
+ "# ATTENTION buildroot devels!\n"
+ "# See top of this file before playing with this auto-preprequisites!\n"
+ "#\n"), name);
+ return 0;
+}
+
/* write a dependency file as used by kbuild to track dependencies */
int file_write_dep(const char *name)
{
@@ -49,7 +152,8 @@
"$(deps_config): ;\n");
fclose(out);
rename("..config.tmp", name);
- return 0;
+
+ return write_make_deps(NULL);
}
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/config
@ 2007-09-23 14:12 aldot at uclibc.org
0 siblings, 0 replies; 24+ messages in thread
From: aldot at uclibc.org @ 2007-09-23 14:12 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-09-23 07:12:58 -0700 (Sun, 23 Sep 2007)
New Revision: 19970
Log:
- search env for BUILDROOT_CONFIG for use as a config file; defaults to .config
Modified:
trunk/buildroot/package/config/confdata.c
trunk/buildroot/package/config/kconfig-to-buildroot2.patch
Changeset:
Modified: trunk/buildroot/package/config/confdata.c
===================================================================
--- trunk/buildroot/package/config/confdata.c 2007-09-23 14:06:59 UTC (rev 19969)
+++ trunk/buildroot/package/config/confdata.c 2007-09-23 14:12:58 UTC (rev 19970)
@@ -37,7 +37,7 @@
const char *conf_get_configname(void)
{
- char *name = getenv("KCONFIG_CONFIG");
+ char *name = getenv("BUILDROOT_CONFIG");
return name ? name : ".config";
}
Modified: trunk/buildroot/package/config/kconfig-to-buildroot2.patch
===================================================================
--- trunk/buildroot/package/config/kconfig-to-buildroot2.patch 2007-09-23 14:06:59 UTC (rev 19969)
+++ trunk/buildroot/package/config/kconfig-to-buildroot2.patch 2007-09-23 14:12:58 UTC (rev 19970)
@@ -1292,3 +1292,14 @@
"\t$(deps_config)\n\n"
"$(deps_config): ;\n");
fclose(out);
+--- kernel-config/confdata.c 2007-09-23 15:33:26.000000000 +0200
++++ config/confdata.c 2007-09-23 16:10:52.000000000 +0200
+@@ -37,7 +37,7 @@
+
+ const char *conf_get_configname(void)
+ {
+- char *name = getenv("KCONFIG_CONFIG");
++ char *name = getenv("BUILDROOT_CONFIG");
+
+ return name ? name : ".config";
+ }
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/config
@ 2007-07-24 18:20 aldot at uclibc.org
0 siblings, 0 replies; 24+ messages in thread
From: aldot at uclibc.org @ 2007-07-24 18:20 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-07-24 11:20:46 -0700 (Tue, 24 Jul 2007)
New Revision: 19256
Log:
- no features with Apple Inc. (Heikki Lindholm)
Modified:
trunk/buildroot/package/config/foo.h
Changeset:
Modified: trunk/buildroot/package/config/foo.h
===================================================================
--- trunk/buildroot/package/config/foo.h 2007-07-24 18:14:53 UTC (rev 19255)
+++ trunk/buildroot/package/config/foo.h 2007-07-24 18:20:46 UTC (rev 19256)
@@ -1,6 +1,9 @@
#ifndef __KCONFIG_FOO_H
#define __KCONFIG_FOO_H
+
+#ifndef __APPLE__
#include <features.h>
+#endif
#include <limits.h>
#ifndef PATH_MAX
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/config
@ 2007-07-20 7:47 ulf at uclibc.org
0 siblings, 0 replies; 24+ messages in thread
From: ulf at uclibc.org @ 2007-07-20 7:47 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-07-20 00:47:31 -0700 (Fri, 20 Jul 2007)
New Revision: 19168
Log:
Ignore package/config/buildroot-config for commit's
Modified:
trunk/buildroot/package/config/
Changeset:
Property changes on: trunk/buildroot/package/config
___________________________________________________________________
Name: svn:ignore
- conf
mconf
lkc_defs.h
lex.zconf.c
zconf.tab.h
zconf.tab.c
lex.backup
zconf.output
zconf.hash.c
.depend
svn-prop.tmp
.svn-prop.tmp.swp
+ conf
mconf
lkc_defs.h
lex.zconf.c
zconf.tab.h
zconf.tab.c
lex.backup
zconf.output
zconf.hash.c
.depend
svn-prop.tmp
.svn-prop.tmp.swp
buildroot-config
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/config
@ 2007-07-11 14:47 ulf at uclibc.org
0 siblings, 0 replies; 24+ messages in thread
From: ulf at uclibc.org @ 2007-07-11 14:47 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-07-11 07:47:39 -0700 (Wed, 11 Jul 2007)
New Revision: 19066
Log:
Ignore some new files in package/config
Modified:
trunk/buildroot/package/config/
Changeset:
Property changes on: trunk/buildroot/package/config
___________________________________________________________________
Name: svn:ignore
- conf
mconf
lkc_defs.h
lex.zconf.c
zconf.tab.h
zconf.tab.c
lex.backup
zconf.output
+ conf
mconf
lkc_defs.h
lex.zconf.c
zconf.tab.h
zconf.tab.c
lex.backup
zconf.output
zconf.hash.c
.depend
svn-prop.tmp
.svn-prop.tmp.swp
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/config
@ 2007-07-08 0:18 aldot at uclibc.org
0 siblings, 0 replies; 24+ messages in thread
From: aldot at uclibc.org @ 2007-07-08 0:18 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-07-07 17:18:51 -0700 (Sat, 07 Jul 2007)
New Revision: 19026
Log:
- pretty print path for brevity
Modified:
trunk/buildroot/package/config/kconfig-to-buildroot2.patch
Changeset:
Modified: trunk/buildroot/package/config/kconfig-to-buildroot2.patch
===================================================================
--- trunk/buildroot/package/config/kconfig-to-buildroot2.patch 2007-07-08 00:00:17 UTC (rev 19025)
+++ trunk/buildroot/package/config/kconfig-to-buildroot2.patch 2007-07-08 00:18:51 UTC (rev 19026)
@@ -646,7 +646,7 @@
Index: confdata.c
===================================================================
--- kconfig/confdata.c (revision 18967)
-+++ /Buildroot/confdata.c (working copy)
++++ Buildroot/confdata.c (working copy)
@@ -21,7 +21,7 @@ static void conf_warning(const char *fmt
static const char *conf_filename;
static int conf_lineno, conf_warnings, conf_unsaved;
@@ -667,9 +667,8 @@
if (conf_split_config())
return 1;
-diff -rdup x/config/confdata.c package/config/confdata.c
---- x/config/confdata.c 2007-07-07 11:13:12.000000000 +0200
-+++ package/config/confdata.c 2007-07-08 01:30:44.000000000 +0200
+--- kconfig/config/confdata.c 2007-07-07 11:13:12.000000000 +0200
++++ Buildroot/config/confdata.c 2007-07-08 01:30:44.000000000 +0200
@@ -11,6 +11,7 @@
#include <string.h>
#include <time.h>
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/config
@ 2007-07-07 18:17 aldot at uclibc.org
0 siblings, 0 replies; 24+ messages in thread
From: aldot at uclibc.org @ 2007-07-07 18:17 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-07-07 11:17:41 -0700 (Sat, 07 Jul 2007)
New Revision: 19022
Log:
- mention from which version this copy of kconfig comes from (redundant since i noted it already in the checkin message, but ok).
Modified:
trunk/buildroot/package/config/README.buildroot2
Changeset:
Modified: trunk/buildroot/package/config/README.buildroot2
===================================================================
--- trunk/buildroot/package/config/README.buildroot2 2007-07-07 12:58:15 UTC (rev 19021)
+++ trunk/buildroot/package/config/README.buildroot2 2007-07-07 18:17:41 UTC (rev 19022)
@@ -1,4 +1,5 @@
-This is a copy of the kconfig code in the kernel tweaked to suit Buildroot.
+This is a copy of the kconfig code in the kernel (currently 2.6.21.5) tweaked to
+suit Buildroot.
To update:
cp -r /usr/src/linux/scripts/kconfig package/config.new
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/config
@ 2007-07-06 4:58 sjhill at uclibc.org
0 siblings, 0 replies; 24+ messages in thread
From: sjhill at uclibc.org @ 2007-07-06 4:58 UTC (permalink / raw)
To: buildroot
Author: sjhill
Date: 2007-07-05 21:58:01 -0700 (Thu, 05 Jul 2007)
New Revision: 19009
Log:
Remove more stuff during 'make distclean'.
Modified:
trunk/buildroot/package/config/Makefile
Changeset:
Modified: trunk/buildroot/package/config/Makefile
===================================================================
--- trunk/buildroot/package/config/Makefile 2007-07-06 04:26:32 UTC (rev 19008)
+++ trunk/buildroot/package/config/Makefile 2007-07-06 04:58:01 UTC (rev 19009)
@@ -32,7 +32,8 @@
$(Q)rm -f $(clean-files)
distclean: clean
$(Q)rm -f $(lxdialog) $(conf-objs) $(mconf-objs) $(kxgettext-objs) \
- $(hostprogs-y) $(qconf-cxxobjs) $(qconf-objs) $(gconf-objs)
+ $(hostprogs-y) $(qconf-cxxobjs) $(qconf-objs) $(gconf-objs) \
+ mconf .depend
FORCE:
.PHONY: FORCE clean distclean
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/config
@ 2007-07-02 14:35 aldot at uclibc.org
0 siblings, 0 replies; 24+ messages in thread
From: aldot at uclibc.org @ 2007-07-02 14:35 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-07-02 07:35:11 -0700 (Mon, 02 Jul 2007)
New Revision: 18992
Log:
- forgot to write out the .config.cmd
Modified:
trunk/buildroot/package/config/confdata.c
trunk/buildroot/package/config/kconfig-to-buildroot2.patch
Changeset:
Modified: trunk/buildroot/package/config/confdata.c
===================================================================
--- trunk/buildroot/package/config/confdata.c 2007-07-02 09:54:18 UTC (rev 18991)
+++ trunk/buildroot/package/config/confdata.c 2007-07-02 14:35:11 UTC (rev 18992)
@@ -649,11 +649,9 @@
time_t now;
int i, l;
- return 0;
-
sym_clear_all_valid();
- file_write_dep("include/config/auto.conf.cmd");
+ file_write_dep(".config.cmd");
if (conf_split_config())
return 1;
Modified: trunk/buildroot/package/config/kconfig-to-buildroot2.patch
===================================================================
--- trunk/buildroot/package/config/kconfig-to-buildroot2.patch 2007-07-02 09:54:18 UTC (rev 18991)
+++ trunk/buildroot/package/config/kconfig-to-buildroot2.patch 2007-07-02 14:35:11 UTC (rev 18992)
@@ -177,15 +177,6 @@
break;
}
}
-@@ -655,6 +649,8 @@ int conf_write_autoconf(void)
- time_t now;
- int i, l;
-
-+ return 0;
-+
- sym_clear_all_valid();
-
- file_write_dep("include/config/auto.conf.cmd");
@@ -672,22 +668,19 @@ int conf_write_autoconf(void)
return 1;
}
@@ -665,3 +656,14 @@
static void conf_warning(const char *fmt, ...)
{
+--- kconfig/config/confdata.c 2007-07-02 16:07:19.000000000 +0200
++++ Buildroot/config/confdata.c 2007-07-02 16:05:21.000000000 +0200
+@@ -651,7 +651,7 @@ int conf_write_autoconf(void)
+
+ sym_clear_all_valid();
+
+- file_write_dep("include/config/auto.conf.cmd");
++ file_write_dep(".config.cmd");
+
+ if (conf_split_config())
+ return 1;
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/config
@ 2007-06-28 22:38 aldot at uclibc.org
0 siblings, 0 replies; 24+ messages in thread
From: aldot at uclibc.org @ 2007-06-28 22:38 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-06-28 15:38:48 -0700 (Thu, 28 Jun 2007)
New Revision: 18968
Log:
- fix make defconfig (Rick Foos)
Modified:
trunk/buildroot/package/config/confdata.c
trunk/buildroot/package/config/kconfig-to-buildroot2.patch
Changeset:
Modified: trunk/buildroot/package/config/confdata.c
===================================================================
--- trunk/buildroot/package/config/confdata.c 2007-06-28 17:13:51 UTC (rev 18967)
+++ trunk/buildroot/package/config/confdata.c 2007-06-28 22:38:48 UTC (rev 18968)
@@ -21,7 +21,7 @@
static const char *conf_filename;
static int conf_lineno, conf_warnings, conf_unsaved;
-const char conf_defname[] = "extra/Configs/defconfigs/$ARCH";
+const char conf_defname[] = ".defconfig";
static void conf_warning(const char *fmt, ...)
{
Modified: trunk/buildroot/package/config/kconfig-to-buildroot2.patch
===================================================================
--- trunk/buildroot/package/config/kconfig-to-buildroot2.patch 2007-06-28 17:13:51 UTC (rev 18967)
+++ trunk/buildroot/package/config/kconfig-to-buildroot2.patch 2007-06-28 22:38:48 UTC (rev 18968)
@@ -652,3 +652,16 @@
#if YYDEBUG
if (getenv("ZCONF_DEBUG"))
+Index: confdata.c
+===================================================================
+--- kconfig/confdata.c (revision 18967)
++++ /Buildroot/confdata.c (working copy)
+@@ -21,7 +21,7 @@ static void conf_warning(const char *fmt
+ static const char *conf_filename;
+ static int conf_lineno, conf_warnings, conf_unsaved;
+
+-const char conf_defname[] = "extra/Configs/defconfigs/$ARCH";
++const char conf_defname[] = ".defconfig";
+
+ static void conf_warning(const char *fmt, ...)
+ {
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/config
@ 2007-06-28 12:11 aldot at uclibc.org
0 siblings, 0 replies; 24+ messages in thread
From: aldot at uclibc.org @ 2007-06-28 12:11 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-06-28 05:11:12 -0700 (Thu, 28 Jun 2007)
New Revision: 18959
Log:
- respin whole patch for the sake of simplicity
Modified:
trunk/buildroot/package/config/kconfig-to-buildroot2.patch
Changeset:
Modified: trunk/buildroot/package/config/kconfig-to-buildroot2.patch
===================================================================
--- trunk/buildroot/package/config/kconfig-to-buildroot2.patch 2007-06-28 11:53:59 UTC (rev 18958)
+++ trunk/buildroot/package/config/kconfig-to-buildroot2.patch 2007-06-28 12:11:12 UTC (rev 18959)
@@ -1,6 +1,15 @@
---- kconfig/conf.c
-+++ Buildroot/conf.c
-@@ -557,10 +557,10 @@
+--- kconfig/conf.c 2007-06-11 20:37:06.000000000 +0200
++++ Buildroot/conf.c 2007-06-28 13:10:46.000000000 +0200
+@@ -542,7 +542,7 @@ int main(int ac, char **av)
+ exit(1);
+ }
+ conf_parse(name);
+- //zconfdump(stdout);
++ /*zconfdump(stdout);*/
+ switch (input_mode) {
+ case set_default:
+ if (!defconfig_file)
+@@ -557,10 +557,10 @@ int main(int ac, char **av)
case ask_silent:
if (stat(".config", &tmpstat)) {
printf(_("***\n"
@@ -13,7 +22,7 @@
"***\n"));
exit(1);
}
-@@ -603,7 +603,7 @@
+@@ -603,7 +603,7 @@ int main(int ac, char **av)
} else if (conf_get_changed()) {
name = getenv("KCONFIG_NOSILENTUPDATE");
if (name && *name) {
@@ -22,7 +31,7 @@
return 1;
}
} else
-@@ -614,12 +614,12 @@
+@@ -614,12 +614,12 @@ int main(int ac, char **av)
check_conf(&rootmenu);
} while (conf_cnt);
if (conf_write(NULL)) {
@@ -38,9 +47,9 @@
return 1;
}
---- kconfig/confdata.c
-+++ Buildroot/confdata.c
-@@ -21,7 +21,7 @@
+--- kconfig/confdata.c 2007-06-11 20:37:06.000000000 +0200
++++ Buildroot/confdata.c 2007-06-28 13:06:23.000000000 +0200
+@@ -21,7 +21,7 @@ static void conf_warning(const char *fmt
static const char *conf_filename;
static int conf_lineno, conf_warnings, conf_unsaved;
@@ -49,7 +58,7 @@
static void conf_warning(const char *fmt, ...)
{
-@@ -150,22 +150,22 @@
+@@ -150,22 +150,22 @@ load:
sym = NULL;
switch (line[0]) {
case '#':
@@ -77,7 +86,7 @@
if (sym->type == S_UNKNOWN)
sym->type = S_BOOLEAN;
}
-@@ -183,12 +183,8 @@
+@@ -183,12 +183,8 @@ load:
;
}
break;
@@ -92,7 +101,7 @@
if (!p)
continue;
*p++ = 0;
-@@ -199,13 +195,13 @@
+@@ -199,13 +195,13 @@ load:
*p2 = 0;
}
if (def == S_DEF_USER) {
@@ -109,7 +118,7 @@
if (sym->type == S_UNKNOWN)
sym->type = S_OTHER;
}
-@@ -416,7 +412,7 @@
+@@ -416,7 +412,7 @@ int conf_write(const char *name)
if (!out)
return 1;
@@ -118,7 +127,7 @@
sym_calc_value(sym);
time(&now);
env = getenv("KCONFIG_NOTIMESTAMP");
-@@ -425,10 +421,8 @@
+@@ -425,10 +421,8 @@ int conf_write(const char *name)
fprintf(out, _("#\n"
"# Automatically generated make config: don't edit\n"
@@ -129,7 +138,7 @@
use_timestamp ? "# " : "",
use_timestamp ? ctime(&now) : "");
-@@ -462,19 +456,19 @@
+@@ -462,19 +456,19 @@ int conf_write(const char *name)
case S_TRISTATE:
switch (sym_get_tristate_value(sym)) {
case no:
@@ -153,7 +162,7 @@
while (1) {
l = strcspn(str, "\"\\");
if (l) {
-@@ -490,12 +484,12 @@
+@@ -490,12 +484,12 @@ int conf_write(const char *name)
case S_HEX:
str = sym_get_string_value(sym);
if (str[0] != '0' || (str[1] != 'x' && str[1] != 'X')) {
@@ -168,7 +177,7 @@
break;
}
}
-@@ -655,6 +649,8 @@
+@@ -655,6 +649,8 @@ int conf_write_autoconf(void)
time_t now;
int i, l;
@@ -177,7 +186,7 @@
sym_clear_all_valid();
file_write_dep("include/config/auto.conf.cmd");
-@@ -672,22 +668,19 @@
+@@ -672,22 +668,19 @@ int conf_write_autoconf(void)
return 1;
}
@@ -204,7 +213,7 @@
for_all_symbols(i, sym) {
sym_calc_value(sym);
-@@ -700,19 +693,19 @@
+@@ -700,19 +693,19 @@ int conf_write_autoconf(void)
case no:
break;
case mod:
@@ -230,7 +239,7 @@
while (1) {
l = strcspn(str, "\"\\");
if (l) {
-@@ -732,14 +725,14 @@
+@@ -732,14 +725,14 @@ int conf_write_autoconf(void)
case S_HEX:
str = sym_get_string_value(sym);
if (str[0] != '0' || (str[1] != 'x' && str[1] != 'X')) {
@@ -249,9 +258,201 @@
break;
default:
break;
---- kconfig/gconf.c
-+++ Buildroot/gconf.c
-@@ -271,8 +271,8 @@
+--- kconfig/expr.c 2007-06-11 20:37:06.000000000 +0200
++++ Buildroot/expr.c 2007-06-28 13:24:38.000000000 +0200
+@@ -331,7 +331,7 @@ struct expr *expr_trans_bool(struct expr
+ e->right.expr = expr_trans_bool(e->right.expr);
+ break;
+ case E_UNEQUAL:
+- // FOO!=n -> FOO
++ /* FOO!=n -> FOO */
+ if (e->left.sym->type == S_TRISTATE) {
+ if (e->right.sym == &symbol_no) {
+ e->type = E_SYMBOL;
+@@ -380,19 +380,19 @@ struct expr *expr_join_or(struct expr *e
+ if (e1->type == E_EQUAL && e2->type == E_EQUAL &&
+ ((e1->right.sym == &symbol_yes && e2->right.sym == &symbol_mod) ||
+ (e1->right.sym == &symbol_mod && e2->right.sym == &symbol_yes))) {
+- // (a='y') || (a='m') -> (a!='n')
++ /* (a='y') || (a='m') -> (a!='n') */
+ return expr_alloc_comp(E_UNEQUAL, sym1, &symbol_no);
+ }
+ if (e1->type == E_EQUAL && e2->type == E_EQUAL &&
+ ((e1->right.sym == &symbol_yes && e2->right.sym == &symbol_no) ||
+ (e1->right.sym == &symbol_no && e2->right.sym == &symbol_yes))) {
+- // (a='y') || (a='n') -> (a!='m')
++ /* (a='y') || (a='n') -> (a!='m') */
+ return expr_alloc_comp(E_UNEQUAL, sym1, &symbol_mod);
+ }
+ if (e1->type == E_EQUAL && e2->type == E_EQUAL &&
+ ((e1->right.sym == &symbol_mod && e2->right.sym == &symbol_no) ||
+ (e1->right.sym == &symbol_no && e2->right.sym == &symbol_mod))) {
+- // (a='m') || (a='n') -> (a!='y')
++ /* (a='m') || (a='n') -> (a!='y') */
+ return expr_alloc_comp(E_UNEQUAL, sym1, &symbol_yes);
+ }
+ }
+@@ -443,29 +443,29 @@ struct expr *expr_join_and(struct expr *
+
+ if ((e1->type == E_SYMBOL && e2->type == E_EQUAL && e2->right.sym == &symbol_yes) ||
+ (e2->type == E_SYMBOL && e1->type == E_EQUAL && e1->right.sym == &symbol_yes))
+- // (a) && (a='y') -> (a='y')
++ /* (a) && (a='y') -> (a='y') */
+ return expr_alloc_comp(E_EQUAL, sym1, &symbol_yes);
+
+ if ((e1->type == E_SYMBOL && e2->type == E_UNEQUAL && e2->right.sym == &symbol_no) ||
+ (e2->type == E_SYMBOL && e1->type == E_UNEQUAL && e1->right.sym == &symbol_no))
+- // (a) && (a!='n') -> (a)
++ /* (a) && (a!='n') -> (a) */
+ return expr_alloc_symbol(sym1);
+
+ if ((e1->type == E_SYMBOL && e2->type == E_UNEQUAL && e2->right.sym == &symbol_mod) ||
+ (e2->type == E_SYMBOL && e1->type == E_UNEQUAL && e1->right.sym == &symbol_mod))
+- // (a) && (a!='m') -> (a='y')
++ /* (a) && (a!='m') -> (a='y') */
+ return expr_alloc_comp(E_EQUAL, sym1, &symbol_yes);
+
+ if (sym1->type == S_TRISTATE) {
+ if (e1->type == E_EQUAL && e2->type == E_UNEQUAL) {
+- // (a='b') && (a!='c') -> 'b'='c' ? 'n' : a='b'
++ /* (a='b') && (a!='c') -> 'b'='c' ? 'n' : a='b' */
+ sym2 = e1->right.sym;
+ if ((e2->right.sym->flags & SYMBOL_CONST) && (sym2->flags & SYMBOL_CONST))
+ return sym2 != e2->right.sym ? expr_alloc_comp(E_EQUAL, sym1, sym2)
+ : expr_alloc_symbol(&symbol_no);
+ }
+ if (e1->type == E_UNEQUAL && e2->type == E_EQUAL) {
+- // (a='b') && (a!='c') -> 'b'='c' ? 'n' : a='b'
++ /* (a='b') && (a!='c') -> 'b'='c' ? 'n' : a='b' */
+ sym2 = e2->right.sym;
+ if ((e1->right.sym->flags & SYMBOL_CONST) && (sym2->flags & SYMBOL_CONST))
+ return sym2 != e1->right.sym ? expr_alloc_comp(E_EQUAL, sym1, sym2)
+@@ -474,19 +474,19 @@ struct expr *expr_join_and(struct expr *
+ if (e1->type == E_UNEQUAL && e2->type == E_UNEQUAL &&
+ ((e1->right.sym == &symbol_yes && e2->right.sym == &symbol_no) ||
+ (e1->right.sym == &symbol_no && e2->right.sym == &symbol_yes)))
+- // (a!='y') && (a!='n') -> (a='m')
++ /* (a!='y') && (a!='n') -> (a='m') */
+ return expr_alloc_comp(E_EQUAL, sym1, &symbol_mod);
+
+ if (e1->type == E_UNEQUAL && e2->type == E_UNEQUAL &&
+ ((e1->right.sym == &symbol_yes && e2->right.sym == &symbol_mod) ||
+ (e1->right.sym == &symbol_mod && e2->right.sym == &symbol_yes)))
+- // (a!='y') && (a!='m') -> (a='n')
++ /* (a!='y') && (a!='m') -> (a='n') */
+ return expr_alloc_comp(E_EQUAL, sym1, &symbol_no);
+
+ if (e1->type == E_UNEQUAL && e2->type == E_UNEQUAL &&
+ ((e1->right.sym == &symbol_mod && e2->right.sym == &symbol_no) ||
+ (e1->right.sym == &symbol_no && e2->right.sym == &symbol_mod)))
+- // (a!='m') && (a!='n') -> (a='m')
++ /* (a!='m') && (a!='n') -> (a='m') */
+ return expr_alloc_comp(E_EQUAL, sym1, &symbol_yes);
+
+ if ((e1->type == E_SYMBOL && e2->type == E_EQUAL && e2->right.sym == &symbol_mod) ||
+@@ -579,7 +579,7 @@ static void expr_eliminate_dups2(enum ex
+ switch (e1->type) {
+ case E_OR:
+ expr_eliminate_dups2(e1->type, &e1, &e1);
+- // (FOO || BAR) && (!FOO && !BAR) -> n
++ /* (FOO || BAR) && (!FOO && !BAR) -> n */
+ tmp1 = expr_transform(expr_alloc_one(E_NOT, expr_copy(e1)));
+ tmp2 = expr_copy(e2);
+ tmp = expr_extract_eq_and(&tmp1, &tmp2);
+@@ -594,7 +594,7 @@ static void expr_eliminate_dups2(enum ex
+ break;
+ case E_AND:
+ expr_eliminate_dups2(e1->type, &e1, &e1);
+- // (FOO && BAR) || (!FOO || !BAR) -> y
++ /* (FOO && BAR) || (!FOO || !BAR) -> y */
+ tmp1 = expr_transform(expr_alloc_one(E_NOT, expr_copy(e1)));
+ tmp2 = expr_copy(e2);
+ tmp = expr_extract_eq_or(&tmp1, &tmp2);
+@@ -703,7 +703,7 @@ struct expr *expr_transform(struct expr
+ case E_NOT:
+ switch (e->left.expr->type) {
+ case E_NOT:
+- // !!a -> a
++ /* !!a -> a */
+ tmp = e->left.expr->left.expr;
+ free(e->left.expr);
+ free(e);
+@@ -712,14 +712,14 @@ struct expr *expr_transform(struct expr
+ break;
+ case E_EQUAL:
+ case E_UNEQUAL:
+- // !a='x' -> a!='x'
++ /* !a='x' -> a!='x' */
+ tmp = e->left.expr;
+ free(e);
+ e = tmp;
+ e->type = e->type == E_EQUAL ? E_UNEQUAL : E_EQUAL;
+ break;
+ case E_OR:
+- // !(a || b) -> !a && !b
++ /* !(a || b) -> !a && !b */
+ tmp = e->left.expr;
+ e->type = E_AND;
+ e->right.expr = expr_alloc_one(E_NOT, tmp->right.expr);
+@@ -728,7 +728,7 @@ struct expr *expr_transform(struct expr
+ e = expr_transform(e);
+ break;
+ case E_AND:
+- // !(a && b) -> !a || !b
++ /* !(a && b) -> !a || !b */
+ tmp = e->left.expr;
+ e->type = E_OR;
+ e->right.expr = expr_alloc_one(E_NOT, tmp->right.expr);
+@@ -738,7 +738,7 @@ struct expr *expr_transform(struct expr
+ break;
+ case E_SYMBOL:
+ if (e->left.expr->left.sym == &symbol_yes) {
+- // !'y' -> 'n'
++ /* !'y' -> 'n' */
+ tmp = e->left.expr;
+ free(e);
+ e = tmp;
+@@ -747,7 +747,7 @@ struct expr *expr_transform(struct expr
+ break;
+ }
+ if (e->left.expr->left.sym == &symbol_mod) {
+- // !'m' -> 'm'
++ /* !'m' -> 'm' */
+ tmp = e->left.expr;
+ free(e);
+ e = tmp;
+@@ -756,7 +756,7 @@ struct expr *expr_transform(struct expr
+ break;
+ }
+ if (e->left.expr->left.sym == &symbol_no) {
+- // !'n' -> 'y'
++ /* !'n' -> 'y' */
+ tmp = e->left.expr;
+ free(e);
+ e = tmp;
+--- kconfig/expr.h 2007-06-11 20:37:06.000000000 +0200
++++ Buildroot/expr.h 2007-06-28 13:08:57.000000000 +0200
+@@ -65,7 +65,7 @@ enum symbol_type {
+
+ enum {
+ S_DEF_USER, /* main user value */
+- S_DEF_AUTO,
++ S_DEF_AUTO
+ };
+
+ struct symbol {
+@@ -139,7 +139,7 @@ struct menu {
+ struct property *prompt;
+ struct expr *dep;
+ unsigned int flags;
+- //char *help;
++ /*char *help; */
+ struct file *file;
+ int lineno;
+ void *data;
+--- kconfig/gconf.c 2007-06-11 20:37:06.000000000 +0200
++++ Buildroot/gconf.c 2007-06-28 12:15:29.000000000 +0200
+@@ -271,8 +271,8 @@ void init_main_window(const gchar * glad
/*"style", PANGO_STYLE_OBLIQUE, */
NULL);
@@ -262,9 +463,20 @@
gtk_window_set_title(GTK_WINDOW(main_wnd), title);
gtk_widget_show(main_wnd);
---- kconfig/mconf.c
-+++ Buildroot/mconf.c
-@@ -30,20 +30,18 @@
+--- kconfig/gconf.glade 2007-06-11 20:37:06.000000000 +0200
++++ Buildroot/gconf.glade 2007-06-28 12:17:40.000000000 +0200
+@@ -5,7 +5,7 @@
+
+ <widget class="GtkWindow" id="window1">
+ <property name="visible">True</property>
+- <property name="title" translatable="yes">Gtk Kernel Configurator</property>
++ <property name="title" translatable="yes">Gtk Buildroot Configurator</property>
+ <property name="type">GTK_WINDOW_TOPLEVEL</property>
+ <property name="window_position">GTK_WIN_POS_NONE</property>
+ <property name="modal">False</property>
+--- kconfig/mconf.c 2007-06-11 20:37:06.000000000 +0200
++++ Buildroot/mconf.c 2007-06-28 12:15:29.000000000 +0200
+@@ -30,20 +30,18 @@ static char menu_backtitle[128];
static const char mconf_readme[] = N_(
"Overview\n"
"--------\n"
@@ -292,7 +504,7 @@
"\n"
"Some additional keyboard hints:\n"
"\n"
-@@ -116,7 +114,7 @@
+@@ -116,7 +114,7 @@ static const char mconf_readme[] = N_(
"-----------------------------\n"
"Menuconfig supports the use of alternate configuration files for\n"
"those who, for various reasons, find it necessary to switch\n"
@@ -301,7 +513,7 @@
"\n"
"At the end of the main menu you will find two options. One is\n"
"for saving the current configuration to a file of your choosing.\n"
-@@ -149,7 +147,7 @@
+@@ -149,7 +147,7 @@ static const char mconf_readme[] = N_(
"\n"
"Optional personality available\n"
"------------------------------\n"
@@ -310,7 +522,7 @@
"menu, rather than the default multimenu hierarchy, run the menuconfig\n"
"with MENUCONFIG_MODE environment variable set to single_menu. Example:\n"
"\n"
-@@ -179,9 +177,9 @@
+@@ -179,9 +177,9 @@ menu_instructions[] = N_(
"Arrow keys navigate the menu. "
"<Enter> selects submenus --->. "
"Highlighted letters are hotkeys. "
@@ -322,7 +534,7 @@
radiolist_instructions[] = N_(
"Use the arrow keys to navigate this window or "
"press the hotkey of the item you wish to select "
-@@ -201,18 +199,18 @@
+@@ -201,18 +199,18 @@ setmod_text[] = N_(
"This feature depends on another which has been configured as a module.\n"
"As a result, this feature will be built as a module."),
nohelp_text[] = N_(
@@ -344,7 +556,7 @@
"to modify that configuration.\n"
"\n"
"If you are uncertain, then you have probably never used alternate\n"
-@@ -222,7 +220,7 @@
+@@ -222,7 +220,7 @@ save_config_text[] = N_(
"as an alternate. Leave blank to abort."),
save_config_help[] = N_(
"\n"
@@ -353,7 +565,7 @@
"configurations available on a single machine.\n"
"\n"
"Entering a file name here will allow you to later retrieve, modify\n"
-@@ -871,9 +869,9 @@
+@@ -871,9 +869,9 @@ int main(int ac, char **av)
conf_parse(av[1]);
conf_read(NULL);
@@ -365,7 +577,7 @@
sym_get_string_value(sym));
mode = getenv("MENUCONFIG_MODE");
-@@ -893,7 +891,7 @@
+@@ -893,7 +891,7 @@ int main(int ac, char **av)
if (conf_get_changed())
res = dialog_yesno(NULL,
_("Do you wish to save your "
@@ -374,7 +586,7 @@
"<ESC><ESC> to continue."),
6, 60);
else
-@@ -905,22 +903,22 @@
+@@ -905,22 +903,22 @@ int main(int ac, char **av)
case 0:
if (conf_write(NULL)) {
fprintf(stderr, _("\n\n"
@@ -403,9 +615,9 @@
- return 0;
+ return conf_write_autoconf();
}
---- kconfig/symbol.c
-+++ Buildroot/symbol.c
-@@ -61,10 +61,10 @@
+--- kconfig/symbol.c 2007-06-11 20:37:06.000000000 +0200
++++ Buildroot/symbol.c 2007-06-28 12:15:29.000000000 +0200
+@@ -61,10 +61,10 @@ void sym_init(void)
if (p)
sym_add_default(sym, p);
@@ -418,9 +630,9 @@
if (p)
sym_add_default(sym, p);
---- kconfig/zconf.tab.c_shipped
-+++ Buildroot/zconf.tab.c_shipped
-@@ -2115,7 +2115,7 @@
+--- kconfig/zconf.tab.c_shipped 2007-06-11 20:37:06.000000000 +0200
++++ Buildroot/zconf.tab.c_shipped 2007-06-28 12:15:29.000000000 +0200
+@@ -2115,7 +2115,7 @@ void conf_parse(const char *name)
modules_sym = sym_lookup(NULL, 0);
modules_sym->type = S_BOOLEAN;
modules_sym->flags |= SYMBOL_AUTO;
@@ -429,9 +641,9 @@
#if YYDEBUG
if (getenv("ZCONF_DEBUG"))
---- kconfig/zconf.y
-+++ Buildroot/zconf.y
-@@ -484,7 +484,7 @@
+--- kconfig/zconf.y 2007-06-11 20:37:06.000000000 +0200
++++ Buildroot/zconf.y 2007-06-28 12:15:29.000000000 +0200
+@@ -484,7 +484,7 @@ void conf_parse(const char *name)
modules_sym = sym_lookup(NULL, 0);
modules_sym->type = S_BOOLEAN;
modules_sym->flags |= SYMBOL_AUTO;
@@ -440,219 +652,3 @@
#if YYDEBUG
if (getenv("ZCONF_DEBUG"))
---- kconfig/gconf.glade 2007-06-11 20:37:06.000000000 +0200
-+++ Buildroot/gconf.glade 2007-06-28 12:17:40.000000000 +0200
-@@ -5,7 +5,7 @@
-
- <widget class="GtkWindow" id="window1">
- <property name="visible">True</property>
-- <property name="title" translatable="yes">Gtk Kernel Configurator</property>
-+ <property name="title" translatable="yes">Gtk Buildroot Configurator</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
- <property name="modal">False</property>
---- kconfig/conf.c (revision 18956)
-+++ Buildroot/conf.c (working copy)
-@@ -542,7 +542,7 @@
- exit(1);
- }
- conf_parse(name);
-- //zconfdump(stdout);
-+ /*zconfdump(stdout);*/
- switch (input_mode) {
- case set_default:
- if (!defconfig_file)
---- kconfig/expr.h (revision 18956)
-+++ Buildroot/expr.h (working copy)
-@@ -65,7 +65,7 @@
-
- enum {
- S_DEF_USER, /* main user value */
-- S_DEF_AUTO,
-+ S_DEF_AUTO
- };
-
- struct symbol {
-@@ -139,7 +139,7 @@
- struct property *prompt;
- struct expr *dep;
- unsigned int flags;
-- //char *help;
-+ /*char *help; */
- struct file *file;
- int lineno;
- void *data;
-Index: expr.c
-===================================================================
---- kconfig/expr.c (revision 18956)
-+++ Buildroot/expr.c (working copy)
-@@ -331,7 +331,7 @@
- e->right.expr = expr_trans_bool(e->right.expr);
- break;
- case E_UNEQUAL:
-- // FOO!=n -> FOO
-+ /* FOO!=n -> FOO */
- if (e->left.sym->type == S_TRISTATE) {
- if (e->right.sym == &symbol_no) {
- e->type = E_SYMBOL;
-@@ -380,19 +380,19 @@
- if (e1->type == E_EQUAL && e2->type == E_EQUAL &&
- ((e1->right.sym == &symbol_yes && e2->right.sym == &symbol_mod) ||
- (e1->right.sym == &symbol_mod && e2->right.sym == &symbol_yes))) {
-- // (a='y') || (a='m') -> (a!='n')
-+ /* (a='y') || (a='m') -> (a!='n') */
- return expr_alloc_comp(E_UNEQUAL, sym1, &symbol_no);
- }
- if (e1->type == E_EQUAL && e2->type == E_EQUAL &&
- ((e1->right.sym == &symbol_yes && e2->right.sym == &symbol_no) ||
- (e1->right.sym == &symbol_no && e2->right.sym == &symbol_yes))) {
-- // (a='y') || (a='n') -> (a!='m')
-+ /* (a='y') || (a='n') -> (a!='m') */
- return expr_alloc_comp(E_UNEQUAL, sym1, &symbol_mod);
- }
- if (e1->type == E_EQUAL && e2->type == E_EQUAL &&
- ((e1->right.sym == &symbol_mod && e2->right.sym == &symbol_no) ||
- (e1->right.sym == &symbol_no && e2->right.sym == &symbol_mod))) {
-- // (a='m') || (a='n') -> (a!='y')
-+ /* (a='m') || (a='n') -> (a!='y') */
- return expr_alloc_comp(E_UNEQUAL, sym1, &symbol_yes);
- }
- }
-@@ -443,29 +443,29 @@
-
- if ((e1->type == E_SYMBOL && e2->type == E_EQUAL && e2->right.sym == &symbol_yes) ||
- (e2->type == E_SYMBOL && e1->type == E_EQUAL && e1->right.sym == &symbol_yes))
-- // (a) && (a='y') -> (a='y')
-+ /* (a) && (a='y') -> (a='y') */
- return expr_alloc_comp(E_EQUAL, sym1, &symbol_yes);
-
- if ((e1->type == E_SYMBOL && e2->type == E_UNEQUAL && e2->right.sym == &symbol_no) ||
- (e2->type == E_SYMBOL && e1->type == E_UNEQUAL && e1->right.sym == &symbol_no))
-- // (a) && (a!='n') -> (a)
-+ /* (a) && (a!='n') -> (a) */
- return expr_alloc_symbol(sym1);
-
- if ((e1->type == E_SYMBOL && e2->type == E_UNEQUAL && e2->right.sym == &symbol_mod) ||
- (e2->type == E_SYMBOL && e1->type == E_UNEQUAL && e1->right.sym == &symbol_mod))
-- // (a) && (a!='m') -> (a='y')
-+ /* (a) && (a!='m') -> (a='y') */
- return expr_alloc_comp(E_EQUAL, sym1, &symbol_yes);
-
- if (sym1->type == S_TRISTATE) {
- if (e1->type == E_EQUAL && e2->type == E_UNEQUAL) {
-- // (a='b') && (a!='c') -> 'b'='c' ? 'n' : a='b'
-+ /* (a='b') && (a!='c') -> 'b'='c' ? 'n' : a='b' */
- sym2 = e1->right.sym;
- if ((e2->right.sym->flags & SYMBOL_CONST) && (sym2->flags & SYMBOL_CONST))
- return sym2 != e2->right.sym ? expr_alloc_comp(E_EQUAL, sym1, sym2)
- : expr_alloc_symbol(&symbol_no);
- }
- if (e1->type == E_UNEQUAL && e2->type == E_EQUAL) {
-- // (a='b') && (a!='c') -> 'b'='c' ? 'n' : a='b'
-+ /* (a='b') && (a!='c') -> 'b'='c' ? 'n' : a='b' */
- sym2 = e2->right.sym;
- if ((e1->right.sym->flags & SYMBOL_CONST) && (sym2->flags & SYMBOL_CONST))
- return sym2 != e1->right.sym ? expr_alloc_comp(E_EQUAL, sym1, sym2)
-@@ -474,19 +474,19 @@
- if (e1->type == E_UNEQUAL && e2->type == E_UNEQUAL &&
- ((e1->right.sym == &symbol_yes && e2->right.sym == &symbol_no) ||
- (e1->right.sym == &symbol_no && e2->right.sym == &symbol_yes)))
-- // (a!='y') && (a!='n') -> (a='m')
-+ /* (a!='y') && (a!='n') -> (a='m') */
- return expr_alloc_comp(E_EQUAL, sym1, &symbol_mod);
-
- if (e1->type == E_UNEQUAL && e2->type == E_UNEQUAL &&
- ((e1->right.sym == &symbol_yes && e2->right.sym == &symbol_mod) ||
- (e1->right.sym == &symbol_mod && e2->right.sym == &symbol_yes)))
-- // (a!='y') && (a!='m') -> (a='n')
-+ /* (a!='y') && (a!='m') -> (a='n') */
- return expr_alloc_comp(E_EQUAL, sym1, &symbol_no);
-
- if (e1->type == E_UNEQUAL && e2->type == E_UNEQUAL &&
- ((e1->right.sym == &symbol_mod && e2->right.sym == &symbol_no) ||
- (e1->right.sym == &symbol_no && e2->right.sym == &symbol_mod)))
-- // (a!='m') && (a!='n') -> (a='m')
-+ /* (a!='m') && (a!='n') -> (a='m') */
- return expr_alloc_comp(E_EQUAL, sym1, &symbol_yes);
-
- if ((e1->type == E_SYMBOL && e2->type == E_EQUAL && e2->right.sym == &symbol_mod) ||
-@@ -579,7 +579,7 @@
- switch (e1->type) {
- case E_OR:
- expr_eliminate_dups2(e1->type, &e1, &e1);
-- // (FOO || BAR) && (!FOO && !BAR) -> n
-+ /* (FOO || BAR) && (!FOO && !BAR) -> n */
- tmp1 = expr_transform(expr_alloc_one(E_NOT, expr_copy(e1)));
- tmp2 = expr_copy(e2);
- tmp = expr_extract_eq_and(&tmp1, &tmp2);
-@@ -594,7 +594,7 @@
- break;
- case E_AND:
- expr_eliminate_dups2(e1->type, &e1, &e1);
-- // (FOO && BAR) || (!FOO || !BAR) -> y
-+ /* (FOO && BAR) || (!FOO || !BAR) -> y */
- tmp1 = expr_transform(expr_alloc_one(E_NOT, expr_copy(e1)));
- tmp2 = expr_copy(e2);
- tmp = expr_extract_eq_or(&tmp1, &tmp2);
-@@ -703,7 +703,7 @@
- case E_NOT:
- switch (e->left.expr->type) {
- case E_NOT:
-- // !!a -> a
-+ /* !!a -> a */
- tmp = e->left.expr->left.expr;
- free(e->left.expr);
- free(e);
-@@ -712,14 +712,14 @@
- break;
- case E_EQUAL:
- case E_UNEQUAL:
-- // !a='x' -> a!='x'
-+ /* !a='x' -> a!='x' */
- tmp = e->left.expr;
- free(e);
- e = tmp;
- e->type = e->type == E_EQUAL ? E_UNEQUAL : E_EQUAL;
- break;
- case E_OR:
-- // !(a || b) -> !a && !b
-+ /* !(a || b) -> !a && !b */
- tmp = e->left.expr;
- e->type = E_AND;
- e->right.expr = expr_alloc_one(E_NOT, tmp->right.expr);
-@@ -728,7 +728,7 @@
- e = expr_transform(e);
- break;
- case E_AND:
-- // !(a && b) -> !a || !b
-+ /* !(a && b) -> !a || !b */
- tmp = e->left.expr;
- e->type = E_OR;
- e->right.expr = expr_alloc_one(E_NOT, tmp->right.expr);
-@@ -738,7 +738,7 @@
- break;
- case E_SYMBOL:
- if (e->left.expr->left.sym == &symbol_yes) {
-- // !'y' -> 'n'
-+ /* !'y' -> 'n' */
- tmp = e->left.expr;
- free(e);
- e = tmp;
-@@ -747,7 +747,7 @@
- break;
- }
- if (e->left.expr->left.sym == &symbol_mod) {
-- // !'m' -> 'm'
-+ /* !'m' -> 'm' */
- tmp = e->left.expr;
- free(e);
- e = tmp;
-@@ -756,7 +756,7 @@
- break;
- }
- if (e->left.expr->left.sym == &symbol_no) {
-- // !'n' -> 'y'
-+ /* !'n' -> 'y' */
- tmp = e->left.expr;
- free(e);
- e = tmp;
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/config
@ 2007-06-28 11:54 aldot at uclibc.org
0 siblings, 0 replies; 24+ messages in thread
From: aldot at uclibc.org @ 2007-06-28 11:54 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-06-28 04:53:59 -0700 (Thu, 28 Jun 2007)
New Revision: 18958
Log:
- make it compile with a C89 compiler
Added:
trunk/buildroot/package/config/foo.h
Modified:
trunk/buildroot/package/config/Makefile
trunk/buildroot/package/config/README.buildroot2
trunk/buildroot/package/config/conf.c
trunk/buildroot/package/config/confdata.c
trunk/buildroot/package/config/expr.c
trunk/buildroot/package/config/expr.h
trunk/buildroot/package/config/kconfig-to-buildroot2.patch
Changeset:
Modified: trunk/buildroot/package/config/Makefile
===================================================================
--- trunk/buildroot/package/config/Makefile 2007-06-28 10:47:05 UTC (rev 18957)
+++ trunk/buildroot/package/config/Makefile 2007-06-28 11:53:59 UTC (rev 18958)
@@ -5,7 +5,7 @@
srctree := .
include Makefile.kconfig
-
+HOSTCFLAGS+=-Dinline="" -include foo.h
-include .depend
.depend: $(wildcard *.h *.c)
$(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) -MM *.c > .depend 2>/dev/null || :
Modified: trunk/buildroot/package/config/README.buildroot2
===================================================================
--- trunk/buildroot/package/config/README.buildroot2 2007-06-28 10:47:05 UTC (rev 18957)
+++ trunk/buildroot/package/config/README.buildroot2 2007-06-28 11:53:59 UTC (rev 18958)
@@ -7,6 +7,8 @@
mv Makefile Makefile.kconfig
patch -p1 < ../config/kconfig-to-buildroot.patch
cp ../config/README.buildroot2 .
+ cp ../config/foo.h .
+ cp ../config/Makefile .
cd ..
rm -rf config
mv config.new config
Modified: trunk/buildroot/package/config/conf.c
===================================================================
--- trunk/buildroot/package/config/conf.c 2007-06-28 10:47:05 UTC (rev 18957)
+++ trunk/buildroot/package/config/conf.c 2007-06-28 11:53:59 UTC (rev 18958)
@@ -542,7 +542,7 @@
exit(1);
}
conf_parse(name);
- //zconfdump(stdout);
+ /*zconfdump(stdout);*/
switch (input_mode) {
case set_default:
if (!defconfig_file)
Modified: trunk/buildroot/package/config/confdata.c
===================================================================
--- trunk/buildroot/package/config/confdata.c 2007-06-28 10:47:05 UTC (rev 18957)
+++ trunk/buildroot/package/config/confdata.c 2007-06-28 11:53:59 UTC (rev 18958)
@@ -183,7 +183,7 @@
;
}
break;
- case 'A' ... 'Z':
+ case 'A': case 'B': case 'C': case 'D': case 'E': case 'F': case 'G': case 'H': case 'I': case 'J': case 'K': case 'L': case 'M': case 'N': case 'O': case 'P': case 'Q': case 'R': case 'S': case 'T': case 'U': case 'V': case 'W': case 'X': case 'Y': case 'Z':
p = strchr(line, '=');
if (!p)
continue;
Modified: trunk/buildroot/package/config/expr.c
===================================================================
--- trunk/buildroot/package/config/expr.c 2007-06-28 10:47:05 UTC (rev 18957)
+++ trunk/buildroot/package/config/expr.c 2007-06-28 11:53:59 UTC (rev 18958)
@@ -331,7 +331,7 @@
e->right.expr = expr_trans_bool(e->right.expr);
break;
case E_UNEQUAL:
- // FOO!=n -> FOO
+ /* FOO!=n -> FOO */
if (e->left.sym->type == S_TRISTATE) {
if (e->right.sym == &symbol_no) {
e->type = E_SYMBOL;
@@ -380,19 +380,19 @@
if (e1->type == E_EQUAL && e2->type == E_EQUAL &&
((e1->right.sym == &symbol_yes && e2->right.sym == &symbol_mod) ||
(e1->right.sym == &symbol_mod && e2->right.sym == &symbol_yes))) {
- // (a='y') || (a='m') -> (a!='n')
+ /* (a='y') || (a='m') -> (a!='n') */
return expr_alloc_comp(E_UNEQUAL, sym1, &symbol_no);
}
if (e1->type == E_EQUAL && e2->type == E_EQUAL &&
((e1->right.sym == &symbol_yes && e2->right.sym == &symbol_no) ||
(e1->right.sym == &symbol_no && e2->right.sym == &symbol_yes))) {
- // (a='y') || (a='n') -> (a!='m')
+ /* (a='y') || (a='n') -> (a!='m') */
return expr_alloc_comp(E_UNEQUAL, sym1, &symbol_mod);
}
if (e1->type == E_EQUAL && e2->type == E_EQUAL &&
((e1->right.sym == &symbol_mod && e2->right.sym == &symbol_no) ||
(e1->right.sym == &symbol_no && e2->right.sym == &symbol_mod))) {
- // (a='m') || (a='n') -> (a!='y')
+ /* (a='m') || (a='n') -> (a!='y') */
return expr_alloc_comp(E_UNEQUAL, sym1, &symbol_yes);
}
}
@@ -443,29 +443,29 @@
if ((e1->type == E_SYMBOL && e2->type == E_EQUAL && e2->right.sym == &symbol_yes) ||
(e2->type == E_SYMBOL && e1->type == E_EQUAL && e1->right.sym == &symbol_yes))
- // (a) && (a='y') -> (a='y')
+ /* (a) && (a='y') -> (a='y') */
return expr_alloc_comp(E_EQUAL, sym1, &symbol_yes);
if ((e1->type == E_SYMBOL && e2->type == E_UNEQUAL && e2->right.sym == &symbol_no) ||
(e2->type == E_SYMBOL && e1->type == E_UNEQUAL && e1->right.sym == &symbol_no))
- // (a) && (a!='n') -> (a)
+ /* (a) && (a!='n') -> (a) */
return expr_alloc_symbol(sym1);
if ((e1->type == E_SYMBOL && e2->type == E_UNEQUAL && e2->right.sym == &symbol_mod) ||
(e2->type == E_SYMBOL && e1->type == E_UNEQUAL && e1->right.sym == &symbol_mod))
- // (a) && (a!='m') -> (a='y')
+ /* (a) && (a!='m') -> (a='y') */
return expr_alloc_comp(E_EQUAL, sym1, &symbol_yes);
if (sym1->type == S_TRISTATE) {
if (e1->type == E_EQUAL && e2->type == E_UNEQUAL) {
- // (a='b') && (a!='c') -> 'b'='c' ? 'n' : a='b'
+ /* (a='b') && (a!='c') -> 'b'='c' ? 'n' : a='b' */
sym2 = e1->right.sym;
if ((e2->right.sym->flags & SYMBOL_CONST) && (sym2->flags & SYMBOL_CONST))
return sym2 != e2->right.sym ? expr_alloc_comp(E_EQUAL, sym1, sym2)
: expr_alloc_symbol(&symbol_no);
}
if (e1->type == E_UNEQUAL && e2->type == E_EQUAL) {
- // (a='b') && (a!='c') -> 'b'='c' ? 'n' : a='b'
+ /* (a='b') && (a!='c') -> 'b'='c' ? 'n' : a='b' */
sym2 = e2->right.sym;
if ((e1->right.sym->flags & SYMBOL_CONST) && (sym2->flags & SYMBOL_CONST))
return sym2 != e1->right.sym ? expr_alloc_comp(E_EQUAL, sym1, sym2)
@@ -474,19 +474,19 @@
if (e1->type == E_UNEQUAL && e2->type == E_UNEQUAL &&
((e1->right.sym == &symbol_yes && e2->right.sym == &symbol_no) ||
(e1->right.sym == &symbol_no && e2->right.sym == &symbol_yes)))
- // (a!='y') && (a!='n') -> (a='m')
+ /* (a!='y') && (a!='n') -> (a='m') */
return expr_alloc_comp(E_EQUAL, sym1, &symbol_mod);
if (e1->type == E_UNEQUAL && e2->type == E_UNEQUAL &&
((e1->right.sym == &symbol_yes && e2->right.sym == &symbol_mod) ||
(e1->right.sym == &symbol_mod && e2->right.sym == &symbol_yes)))
- // (a!='y') && (a!='m') -> (a='n')
+ /* (a!='y') && (a!='m') -> (a='n') */
return expr_alloc_comp(E_EQUAL, sym1, &symbol_no);
if (e1->type == E_UNEQUAL && e2->type == E_UNEQUAL &&
((e1->right.sym == &symbol_mod && e2->right.sym == &symbol_no) ||
(e1->right.sym == &symbol_no && e2->right.sym == &symbol_mod)))
- // (a!='m') && (a!='n') -> (a='m')
+ /* (a!='m') && (a!='n') -> (a='m') */
return expr_alloc_comp(E_EQUAL, sym1, &symbol_yes);
if ((e1->type == E_SYMBOL && e2->type == E_EQUAL && e2->right.sym == &symbol_mod) ||
@@ -579,7 +579,7 @@
switch (e1->type) {
case E_OR:
expr_eliminate_dups2(e1->type, &e1, &e1);
- // (FOO || BAR) && (!FOO && !BAR) -> n
+ /* (FOO || BAR) && (!FOO && !BAR) -> n */
tmp1 = expr_transform(expr_alloc_one(E_NOT, expr_copy(e1)));
tmp2 = expr_copy(e2);
tmp = expr_extract_eq_and(&tmp1, &tmp2);
@@ -594,7 +594,7 @@
break;
case E_AND:
expr_eliminate_dups2(e1->type, &e1, &e1);
- // (FOO && BAR) || (!FOO || !BAR) -> y
+ /* (FOO && BAR) || (!FOO || !BAR) -> y */
tmp1 = expr_transform(expr_alloc_one(E_NOT, expr_copy(e1)));
tmp2 = expr_copy(e2);
tmp = expr_extract_eq_or(&tmp1, &tmp2);
@@ -703,7 +703,7 @@
case E_NOT:
switch (e->left.expr->type) {
case E_NOT:
- // !!a -> a
+ /* !!a -> a */
tmp = e->left.expr->left.expr;
free(e->left.expr);
free(e);
@@ -712,14 +712,14 @@
break;
case E_EQUAL:
case E_UNEQUAL:
- // !a='x' -> a!='x'
+ /* !a='x' -> a!='x' */
tmp = e->left.expr;
free(e);
e = tmp;
e->type = e->type == E_EQUAL ? E_UNEQUAL : E_EQUAL;
break;
case E_OR:
- // !(a || b) -> !a && !b
+ /* !(a || b) -> !a && !b */
tmp = e->left.expr;
e->type = E_AND;
e->right.expr = expr_alloc_one(E_NOT, tmp->right.expr);
@@ -728,7 +728,7 @@
e = expr_transform(e);
break;
case E_AND:
- // !(a && b) -> !a || !b
+ /* !(a && b) -> !a || !b */
tmp = e->left.expr;
e->type = E_OR;
e->right.expr = expr_alloc_one(E_NOT, tmp->right.expr);
@@ -738,7 +738,7 @@
break;
case E_SYMBOL:
if (e->left.expr->left.sym == &symbol_yes) {
- // !'y' -> 'n'
+ /* !'y' -> 'n' */
tmp = e->left.expr;
free(e);
e = tmp;
@@ -747,7 +747,7 @@
break;
}
if (e->left.expr->left.sym == &symbol_mod) {
- // !'m' -> 'm'
+ /* !'m' -> 'm' */
tmp = e->left.expr;
free(e);
e = tmp;
@@ -756,7 +756,7 @@
break;
}
if (e->left.expr->left.sym == &symbol_no) {
- // !'n' -> 'y'
+ /* !'n' -> 'y' */
tmp = e->left.expr;
free(e);
e = tmp;
Modified: trunk/buildroot/package/config/expr.h
===================================================================
--- trunk/buildroot/package/config/expr.h 2007-06-28 10:47:05 UTC (rev 18957)
+++ trunk/buildroot/package/config/expr.h 2007-06-28 11:53:59 UTC (rev 18958)
@@ -65,7 +65,7 @@
enum {
S_DEF_USER, /* main user value */
- S_DEF_AUTO,
+ S_DEF_AUTO
};
struct symbol {
@@ -139,7 +139,7 @@
struct property *prompt;
struct expr *dep;
unsigned int flags;
- //char *help;
+ /*char *help; */
struct file *file;
int lineno;
void *data;
Added: trunk/buildroot/package/config/foo.h
===================================================================
--- trunk/buildroot/package/config/foo.h (rev 0)
+++ trunk/buildroot/package/config/foo.h 2007-06-28 11:53:59 UTC (rev 18958)
@@ -0,0 +1,9 @@
+#ifndef __KCONFIG_FOO_H
+#define __KCONFIG_FOO_H
+#include <features.h>
+#include <limits.h>
+
+#ifndef PATH_MAX
+#define PATH_MAX 1024
+#endif
+#endif /* __KCONFIG_FOO_H */
Modified: trunk/buildroot/package/config/kconfig-to-buildroot2.patch
===================================================================
--- trunk/buildroot/package/config/kconfig-to-buildroot2.patch 2007-06-28 10:47:05 UTC (rev 18957)
+++ trunk/buildroot/package/config/kconfig-to-buildroot2.patch 2007-06-28 11:53:59 UTC (rev 18958)
@@ -87,7 +87,7 @@
- continue;
- }
- p = strchr(line + 7, '=');
-+ case 'A' ... 'Z':
++ case 'A': case 'B': case 'C': case 'D': case 'E': case 'F': case 'G': case 'H': case 'I': case 'J': case 'K': case 'L': case 'M': case 'N': case 'O': case 'P': case 'Q': case 'R': case 'S': case 'T': case 'U': case 'V': case 'W': case 'X': case 'Y': case 'Z':
+ p = strchr(line, '=');
if (!p)
continue;
@@ -451,3 +451,208 @@
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_NONE</property>
<property name="modal">False</property>
+--- kconfig/conf.c (revision 18956)
++++ Buildroot/conf.c (working copy)
+@@ -542,7 +542,7 @@
+ exit(1);
+ }
+ conf_parse(name);
+- //zconfdump(stdout);
++ /*zconfdump(stdout);*/
+ switch (input_mode) {
+ case set_default:
+ if (!defconfig_file)
+--- kconfig/expr.h (revision 18956)
++++ Buildroot/expr.h (working copy)
+@@ -65,7 +65,7 @@
+
+ enum {
+ S_DEF_USER, /* main user value */
+- S_DEF_AUTO,
++ S_DEF_AUTO
+ };
+
+ struct symbol {
+@@ -139,7 +139,7 @@
+ struct property *prompt;
+ struct expr *dep;
+ unsigned int flags;
+- //char *help;
++ /*char *help; */
+ struct file *file;
+ int lineno;
+ void *data;
+Index: expr.c
+===================================================================
+--- kconfig/expr.c (revision 18956)
++++ Buildroot/expr.c (working copy)
+@@ -331,7 +331,7 @@
+ e->right.expr = expr_trans_bool(e->right.expr);
+ break;
+ case E_UNEQUAL:
+- // FOO!=n -> FOO
++ /* FOO!=n -> FOO */
+ if (e->left.sym->type == S_TRISTATE) {
+ if (e->right.sym == &symbol_no) {
+ e->type = E_SYMBOL;
+@@ -380,19 +380,19 @@
+ if (e1->type == E_EQUAL && e2->type == E_EQUAL &&
+ ((e1->right.sym == &symbol_yes && e2->right.sym == &symbol_mod) ||
+ (e1->right.sym == &symbol_mod && e2->right.sym == &symbol_yes))) {
+- // (a='y') || (a='m') -> (a!='n')
++ /* (a='y') || (a='m') -> (a!='n') */
+ return expr_alloc_comp(E_UNEQUAL, sym1, &symbol_no);
+ }
+ if (e1->type == E_EQUAL && e2->type == E_EQUAL &&
+ ((e1->right.sym == &symbol_yes && e2->right.sym == &symbol_no) ||
+ (e1->right.sym == &symbol_no && e2->right.sym == &symbol_yes))) {
+- // (a='y') || (a='n') -> (a!='m')
++ /* (a='y') || (a='n') -> (a!='m') */
+ return expr_alloc_comp(E_UNEQUAL, sym1, &symbol_mod);
+ }
+ if (e1->type == E_EQUAL && e2->type == E_EQUAL &&
+ ((e1->right.sym == &symbol_mod && e2->right.sym == &symbol_no) ||
+ (e1->right.sym == &symbol_no && e2->right.sym == &symbol_mod))) {
+- // (a='m') || (a='n') -> (a!='y')
++ /* (a='m') || (a='n') -> (a!='y') */
+ return expr_alloc_comp(E_UNEQUAL, sym1, &symbol_yes);
+ }
+ }
+@@ -443,29 +443,29 @@
+
+ if ((e1->type == E_SYMBOL && e2->type == E_EQUAL && e2->right.sym == &symbol_yes) ||
+ (e2->type == E_SYMBOL && e1->type == E_EQUAL && e1->right.sym == &symbol_yes))
+- // (a) && (a='y') -> (a='y')
++ /* (a) && (a='y') -> (a='y') */
+ return expr_alloc_comp(E_EQUAL, sym1, &symbol_yes);
+
+ if ((e1->type == E_SYMBOL && e2->type == E_UNEQUAL && e2->right.sym == &symbol_no) ||
+ (e2->type == E_SYMBOL && e1->type == E_UNEQUAL && e1->right.sym == &symbol_no))
+- // (a) && (a!='n') -> (a)
++ /* (a) && (a!='n') -> (a) */
+ return expr_alloc_symbol(sym1);
+
+ if ((e1->type == E_SYMBOL && e2->type == E_UNEQUAL && e2->right.sym == &symbol_mod) ||
+ (e2->type == E_SYMBOL && e1->type == E_UNEQUAL && e1->right.sym == &symbol_mod))
+- // (a) && (a!='m') -> (a='y')
++ /* (a) && (a!='m') -> (a='y') */
+ return expr_alloc_comp(E_EQUAL, sym1, &symbol_yes);
+
+ if (sym1->type == S_TRISTATE) {
+ if (e1->type == E_EQUAL && e2->type == E_UNEQUAL) {
+- // (a='b') && (a!='c') -> 'b'='c' ? 'n' : a='b'
++ /* (a='b') && (a!='c') -> 'b'='c' ? 'n' : a='b' */
+ sym2 = e1->right.sym;
+ if ((e2->right.sym->flags & SYMBOL_CONST) && (sym2->flags & SYMBOL_CONST))
+ return sym2 != e2->right.sym ? expr_alloc_comp(E_EQUAL, sym1, sym2)
+ : expr_alloc_symbol(&symbol_no);
+ }
+ if (e1->type == E_UNEQUAL && e2->type == E_EQUAL) {
+- // (a='b') && (a!='c') -> 'b'='c' ? 'n' : a='b'
++ /* (a='b') && (a!='c') -> 'b'='c' ? 'n' : a='b' */
+ sym2 = e2->right.sym;
+ if ((e1->right.sym->flags & SYMBOL_CONST) && (sym2->flags & SYMBOL_CONST))
+ return sym2 != e1->right.sym ? expr_alloc_comp(E_EQUAL, sym1, sym2)
+@@ -474,19 +474,19 @@
+ if (e1->type == E_UNEQUAL && e2->type == E_UNEQUAL &&
+ ((e1->right.sym == &symbol_yes && e2->right.sym == &symbol_no) ||
+ (e1->right.sym == &symbol_no && e2->right.sym == &symbol_yes)))
+- // (a!='y') && (a!='n') -> (a='m')
++ /* (a!='y') && (a!='n') -> (a='m') */
+ return expr_alloc_comp(E_EQUAL, sym1, &symbol_mod);
+
+ if (e1->type == E_UNEQUAL && e2->type == E_UNEQUAL &&
+ ((e1->right.sym == &symbol_yes && e2->right.sym == &symbol_mod) ||
+ (e1->right.sym == &symbol_mod && e2->right.sym == &symbol_yes)))
+- // (a!='y') && (a!='m') -> (a='n')
++ /* (a!='y') && (a!='m') -> (a='n') */
+ return expr_alloc_comp(E_EQUAL, sym1, &symbol_no);
+
+ if (e1->type == E_UNEQUAL && e2->type == E_UNEQUAL &&
+ ((e1->right.sym == &symbol_mod && e2->right.sym == &symbol_no) ||
+ (e1->right.sym == &symbol_no && e2->right.sym == &symbol_mod)))
+- // (a!='m') && (a!='n') -> (a='m')
++ /* (a!='m') && (a!='n') -> (a='m') */
+ return expr_alloc_comp(E_EQUAL, sym1, &symbol_yes);
+
+ if ((e1->type == E_SYMBOL && e2->type == E_EQUAL && e2->right.sym == &symbol_mod) ||
+@@ -579,7 +579,7 @@
+ switch (e1->type) {
+ case E_OR:
+ expr_eliminate_dups2(e1->type, &e1, &e1);
+- // (FOO || BAR) && (!FOO && !BAR) -> n
++ /* (FOO || BAR) && (!FOO && !BAR) -> n */
+ tmp1 = expr_transform(expr_alloc_one(E_NOT, expr_copy(e1)));
+ tmp2 = expr_copy(e2);
+ tmp = expr_extract_eq_and(&tmp1, &tmp2);
+@@ -594,7 +594,7 @@
+ break;
+ case E_AND:
+ expr_eliminate_dups2(e1->type, &e1, &e1);
+- // (FOO && BAR) || (!FOO || !BAR) -> y
++ /* (FOO && BAR) || (!FOO || !BAR) -> y */
+ tmp1 = expr_transform(expr_alloc_one(E_NOT, expr_copy(e1)));
+ tmp2 = expr_copy(e2);
+ tmp = expr_extract_eq_or(&tmp1, &tmp2);
+@@ -703,7 +703,7 @@
+ case E_NOT:
+ switch (e->left.expr->type) {
+ case E_NOT:
+- // !!a -> a
++ /* !!a -> a */
+ tmp = e->left.expr->left.expr;
+ free(e->left.expr);
+ free(e);
+@@ -712,14 +712,14 @@
+ break;
+ case E_EQUAL:
+ case E_UNEQUAL:
+- // !a='x' -> a!='x'
++ /* !a='x' -> a!='x' */
+ tmp = e->left.expr;
+ free(e);
+ e = tmp;
+ e->type = e->type == E_EQUAL ? E_UNEQUAL : E_EQUAL;
+ break;
+ case E_OR:
+- // !(a || b) -> !a && !b
++ /* !(a || b) -> !a && !b */
+ tmp = e->left.expr;
+ e->type = E_AND;
+ e->right.expr = expr_alloc_one(E_NOT, tmp->right.expr);
+@@ -728,7 +728,7 @@
+ e = expr_transform(e);
+ break;
+ case E_AND:
+- // !(a && b) -> !a || !b
++ /* !(a && b) -> !a || !b */
+ tmp = e->left.expr;
+ e->type = E_OR;
+ e->right.expr = expr_alloc_one(E_NOT, tmp->right.expr);
+@@ -738,7 +738,7 @@
+ break;
+ case E_SYMBOL:
+ if (e->left.expr->left.sym == &symbol_yes) {
+- // !'y' -> 'n'
++ /* !'y' -> 'n' */
+ tmp = e->left.expr;
+ free(e);
+ e = tmp;
+@@ -747,7 +747,7 @@
+ break;
+ }
+ if (e->left.expr->left.sym == &symbol_mod) {
+- // !'m' -> 'm'
++ /* !'m' -> 'm' */
+ tmp = e->left.expr;
+ free(e);
+ e = tmp;
+@@ -756,7 +756,7 @@
+ break;
+ }
+ if (e->left.expr->left.sym == &symbol_no) {
+- // !'n' -> 'y'
++ /* !'n' -> 'y' */
+ tmp = e->left.expr;
+ free(e);
+ e = tmp;
^ permalink raw reply [flat|nested] 24+ messages in thread
end of thread, other threads:[~2008-12-13 11:52 UTC | newest]
Thread overview: 24+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-12-13 11:52 [Buildroot] svn commit: trunk/buildroot/package/config jacmet at uclibc.org
-- strict thread matches above, loose matches on Subject: below --
2008-10-16 19:28 jacmet at uclibc.org
2008-08-27 20:18 jacmet at uclibc.org
2008-06-19 19:06 jacmet at uclibc.org
2008-06-19 8:11 jacmet at uclibc.org
2008-06-19 16:44 ` hartleys
2008-06-19 18:18 ` Fathi Boudra
2008-06-19 19:07 ` Peter Korsgaard
2008-06-19 19:06 ` Peter Korsgaard
2007-09-29 20:21 aldot at uclibc.org
2007-09-29 20:08 aldot at uclibc.org
2007-09-23 20:46 aldot at uclibc.org
2007-09-23 20:28 aldot at uclibc.org
2007-09-23 14:12 aldot at uclibc.org
2007-07-24 18:20 aldot at uclibc.org
2007-07-20 7:47 ulf at uclibc.org
2007-07-11 14:47 ulf at uclibc.org
2007-07-08 0:18 aldot at uclibc.org
2007-07-07 18:17 aldot at uclibc.org
2007-07-06 4:58 sjhill at uclibc.org
2007-07-02 14:35 aldot at uclibc.org
2007-06-28 22:38 aldot at uclibc.org
2007-06-28 12:11 aldot at uclibc.org
2007-06-28 11:54 aldot at uclibc.org
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.