emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build system: fix "allnoconfig" to clear all options. Closes 10296

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2017-09-07 14:40:28 +02:00
parent 9d858f5717
commit 0b1c629342
1 changed files with 52 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
scripts/kconfig/conf.c
View File

@ -76,14 +76,51 @@ static void conf_askvalue(struct symbol *sym, const char *def)
line[0] = '\n'; line[0] = '\n';
line[1] = 0; line[1] = 0;
line[2] = 0;
if (!sym_is_changable(sym)) { if (!sym_is_changable(sym)) {
printf("%s\n", def); printf("%s\n", def);
line[0] = '\n';
line[1] = 0;
return; return;
} }
// If autoconf run (allnoconfig and such), reset bool and tristates:
// "select ITEM" sets ITEM=y and then parent item might have been
// reset to "n" later. Try to set ITEM to "n" on the second run.
if (type == S_BOOLEAN || type == S_TRISTATE) {
switch (input_mode) {
case set_yes:
if (sym_tristate_within_range(sym, yes)) {
line[0] = 'y';
line[1] = '\n';
printf("%s", line);
return;
}
case set_mod:
if (type == S_TRISTATE) {
if (sym_tristate_within_range(sym, mod)) {
line[0] = 'm';
line[1] = '\n';
printf("%s", line);
return;
}
} else {
if (sym_tristate_within_range(sym, yes)) {
line[0] = 'y';
line[1] = '\n';
printf("%s", line);
return;
}
}
case set_no:
if (sym_tristate_within_range(sym, no)) {
line[0] = 'n';
line[1] = '\n';
printf("%s", line);
return;
}
}
}
switch (input_mode) { switch (input_mode) {
case set_no: case set_no:
case set_mod: case set_mod:
@ -590,6 +627,19 @@ int main(int ac, char **av)
if (input_mode != ask_silent) { if (input_mode != ask_silent) {
rootEntry = &rootmenu; rootEntry = &rootmenu;
conf(&rootmenu); conf(&rootmenu);
// If autoconf run (allnoconfig and such), run it twice:
// "select ITEM" sets ITEM=y and then parent item
// is reset to "n" later. Second run sets ITEM to "n".
// Example: ADDUSER selects LONG_OPTS.
// allnoconfig must set _both_ to "n".
// Before, LONG_OPTS remained "y".
if (input_mode == set_no
|| input_mode == set_mod
|| input_mode == set_yes
) {
rootEntry = &rootmenu;
conf(&rootmenu);
}
if (input_mode == ask_all) { if (input_mode == ask_all) {
input_mode = ask_silent; input_mode = ask_silent;
valid_stdin = 1; valid_stdin = 1;