kconfig: Don't go out from read config loop when you read new symbol
commit 8baefd30b5
of linux-next replaced
a `switch()' statement with some `if()' statements, but left `break's
in the `switch()' statement untouched. This cause read config loop to
exit and so "make oldconfig" is not much usable (see below).
> $ make oldconfig
><snip>
> scripts/kconfig/conf --oldconfig Kconfig
> #
> # using defaults found in /boot/config-2.6.34-ccs-r1
> #
> *
> * Restart config...
> *
> *
> * General setup
> *
> Prompt for development and/or incomplete code/drivers (EXPERIMENTAL) [N/y/?] (NEW)
(I've already have "CONFIG_EXPERIMENTAL=y" in the old config file. But
that's not read here.)
This patch should fix this problem.
Signed-off-by: Naohiro Aota <naota@elisp.net>
Signed-off-by: Michal Marek <mmarek@suse.cz>
This commit is contained in:
Родитель
0455029bea
Коммит
8bea7548ee
|
@ -234,7 +234,7 @@ load:
|
||||||
sym = sym_find(line + 2 + strlen(CONFIG_));
|
sym = sym_find(line + 2 + strlen(CONFIG_));
|
||||||
if (!sym) {
|
if (!sym) {
|
||||||
sym_add_change_count(1);
|
sym_add_change_count(1);
|
||||||
break;
|
goto setsym;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
sym = sym_lookup(line + 2 + strlen(CONFIG_), 0);
|
sym = sym_lookup(line + 2 + strlen(CONFIG_), 0);
|
||||||
|
@ -268,7 +268,7 @@ load:
|
||||||
sym = sym_find(line + strlen(CONFIG_));
|
sym = sym_find(line + strlen(CONFIG_));
|
||||||
if (!sym) {
|
if (!sym) {
|
||||||
sym_add_change_count(1);
|
sym_add_change_count(1);
|
||||||
break;
|
goto setsym;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
sym = sym_lookup(line + strlen(CONFIG_), 0);
|
sym = sym_lookup(line + strlen(CONFIG_), 0);
|
||||||
|
@ -285,6 +285,7 @@ load:
|
||||||
conf_warning("unexpected data");
|
conf_warning("unexpected data");
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
setsym:
|
||||||
if (sym && sym_is_choice_value(sym)) {
|
if (sym && sym_is_choice_value(sym)) {
|
||||||
struct symbol *cs = prop_get_symbol(sym_get_choice_prop(sym));
|
struct symbol *cs = prop_get_symbol(sym_get_choice_prop(sym));
|
||||||
switch (sym->def[def].tri) {
|
switch (sym->def[def].tri) {
|
||||||
|
|
Загрузка…
Ссылка в новой задаче