diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-10-28 14:09:12 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-10-28 14:09:12 +0000 |
| commit | e7220316405bee3cba9de6d781403124525923be (patch) | |
| tree | 49f941aa07281d5318170b2ffaef3f71eb7cb96f /scripts/config/symbol.c | |
| parent | 41f2b5ed5fc1c36aa0489b39afd4f3120b8e5338 (diff) | |
scripts/config: merge fixes for various issues, including recursive dependency detection/handling (patch by mbm)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28658 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'scripts/config/symbol.c')
| -rw-r--r-- | scripts/config/symbol.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/scripts/config/symbol.c b/scripts/config/symbol.c index 2c1392ad4..1d718da3a 100644 --- a/scripts/config/symbol.c +++ b/scripts/config/symbol.c @@ -56,7 +56,6 @@ void sym_init(void) sym = sym_lookup("ARCH", 0); sym->type = S_STRING; - sym->flags |= SYMBOL_AUTO; p = getenv("ARCH"); if (p) sym_add_default(sym, p); @@ -362,11 +361,14 @@ void sym_calc_value(struct symbol *sym) sym->curr.val = sym_calc_choice(sym); sym_validate_range(sym); - if (memcmp(&oldval, &sym->curr, sizeof(oldval))) + if (memcmp(&oldval, &sym->curr, sizeof(oldval))) { + sym->flags &= ~SYMBOL_VALID; sym_set_changed(sym); - - if (modules_sym == sym) - modules_val = modules_sym->curr.tri; + if (modules_sym == sym) { + sym_set_all_changed(); + modules_val = modules_sym->curr.tri; + } + } if (sym_is_choice(sym)) { int flags = sym->flags & (SYMBOL_CHANGED | SYMBOL_WRITE); @@ -377,6 +379,9 @@ void sym_calc_value(struct symbol *sym) sym_set_changed(e->right.sym); } } + + if (sym->flags & SYMBOL_AUTO) + sym->flags &= ~SYMBOL_WRITE; } void sym_clear_all_valid(void) @@ -462,8 +467,6 @@ bool sym_set_tristate_value(struct symbol *sym, tristate val) sym->user.tri = val; if (oldval != val) { sym_clear_all_valid(); - if (sym == modules_sym) - sym_set_all_changed(); } return true; @@ -756,6 +759,7 @@ struct symbol **sym_re_search(const char *pattern) return NULL; } } + sym_calc_value(sym); sym_arr[cnt++] = sym; } if (sym_arr) |