diff options
| author | Peter Korsgaard | 2011-02-02 11:48:58 +0100 |
|---|---|---|
| committer | Peter Korsgaard | 2011-02-02 15:54:50 +0100 |
| commit | 72daa122b6a4a9562109299d0b747c71aac1e483 (patch) | |
| tree | cc1dff80e1e89158b0cac778433fcea5c08ae5f9 /package/config/zconf.y | |
| parent | package/config: Rebase against Linux 2.6.36 (diff) | |
| download | buildroot-72daa122b6a4a9562109299d0b747c71aac1e483.tar.gz buildroot-72daa122b6a4a9562109299d0b747c71aac1e483.tar.xz buildroot-72daa122b6a4a9562109299d0b747c71aac1e483.zip | |
package/config: rebase against 2.6.37-rc1
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/config/zconf.y')
| -rw-r--r-- | package/config/zconf.y | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/package/config/zconf.y b/package/config/zconf.y index 956add165..04d57886c 100644 --- a/package/config/zconf.y +++ b/package/config/zconf.y @@ -36,7 +36,7 @@ static struct menu *current_menu, *current_entry; #define YYERROR_VERBOSE #endif %} -%expect 26 +%expect 28 %union { @@ -104,14 +104,15 @@ static struct menu *current_menu, *current_entry; %} %% -input: stmt_list; +input: nl start | start; + +start: mainmenu_stmt stmt_list | stmt_list; stmt_list: /* empty */ | stmt_list common_stmt | stmt_list choice_stmt | stmt_list menu_stmt - | stmt_list T_MAINMENU prompt nl | stmt_list end { zconf_error("unexpected end statement"); } | stmt_list T_WORD error T_EOL { zconf_error("unknown statement \"%s\"", $2); } | stmt_list option_name error T_EOL @@ -342,6 +343,13 @@ if_block: | if_block choice_stmt ; +/* mainmenu entry */ + +mainmenu_stmt: T_MAINMENU prompt nl +{ + menu_add_prompt(P_MENU, $2, NULL); +}; + /* menu entry */ menu: T_MENU prompt T_EOL @@ -494,6 +502,10 @@ void conf_parse(const char *name) prop = prop_alloc(P_DEFAULT, modules_sym); prop->expr = expr_alloc_symbol(sym_lookup("MODULES", 0)); } + + rootmenu.prompt->text = _(rootmenu.prompt->text); + rootmenu.prompt->text = sym_expand_string_value(rootmenu.prompt->text); + menu_finalize(&rootmenu); for_all_symbols(i, sym) { if (sym_check_deps(sym)) |