diff options
| author | Arnaud Lacombe <lacombar@gmail.com> | 2011-06-08 01:42:11 -0400 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2011-06-24 17:21:27 +0200 |
| commit | ec6452a5ec68498221a0ced3443cefd65b08be36 (patch) | |
| tree | 74db3525b2a439465ec40406ac98ba5b35c7fd03 /scripts/kconfig/menu.c | |
| parent | 36fee53510f91d8ac5eb5dcba0e431a21ebdd5cd (diff) | |
| download | linux-3.10-ec6452a5ec68498221a0ced3443cefd65b08be36.tar.gz linux-3.10-ec6452a5ec68498221a0ced3443cefd65b08be36.tar.bz2 linux-3.10-ec6452a5ec68498221a0ced3443cefd65b08be36.zip | |
kconfig: do not overwrite symbol direct dependency in assignment
Considering the following configuration:
config F
bool "F"
choice AB
bool "AB"
config A
bool "A"
config B
bool "B"
endchoice
if A
config D
bool
default y if F
select E
config E
bool "E"
endif
if B
config D
bool
default y if F
select E
config E
bool "E"
endif
The following configuration:
CONFIG_F=y
CONFIG_A=y
# CONFIG_B is not set
CONFIG_D=y
CONFIG_E=y
emits a spurious warning:
(D) selects E which has unmet direct dependencies (B)
If a symbol appears in two different branch of the tree, it should inherit the
dependency of both parent, not just the last one.
Reported-by: Yann E. Morin <yann.morin.1998@anciens.enib.fr>
Tested-by: Yann E. Morin <yann.morin.1998@anciens.enib.fr>
Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
Diffstat (limited to 'scripts/kconfig/menu.c')
| -rw-r--r-- | scripts/kconfig/menu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c index aab5a1fee5a..d66008639a4 100644 --- a/scripts/kconfig/menu.c +++ b/scripts/kconfig/menu.c @@ -351,7 +351,7 @@ void menu_finalize(struct menu *parent) last_menu->next = NULL; } - sym->dir_dep.expr = parent->dep; + sym->dir_dep.expr = expr_alloc_or(sym->dir_dep.expr, parent->dep); } for (menu = parent->list; menu; menu = menu->next) { if (sym && sym_is_choice(sym) && |