hak5/wifipineapple-openwrt
1
0
Fork 0
mirror of https://github.com/hak5/wifipineapple-openwrt.git synced 2025-10-29 16:57:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

scripts/config: merge fixes for various issues, including recursive dependency detection/handling (patch by mbm)

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28658 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
Felix Fietkau
2011-10-28 14:09:12 +00:00
parent 114af4099a
commit 141e0902dc
7 changed files with 82 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
scripts/config/symbol.c
View File

@@ -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)