Commit 3f198dfe authored by Srinivas Kandagatla's avatar Srinivas Kandagatla Committed by Michal Marek

kbuild: Fix help text not displayed in choice option.

Help text under choice menu is never displayed because it does not have
symbol name associated with it, however many kconfigs have help text
under choice, assuming that it will be displayed when user selects help.
for example in Kconfig if we have:
choice
        prompt "Choice"
        ---help---
           HELP TEXT ...

config A
        bool "A"

config B
        bool "B"

endchoice

Without this patch "HELP TEXT" is not displayed when user selects help
option when "Choice" is highlighted from menuconfig or xconfig or
gconfig.

This patch changes the logic in menu_get_ext_help to display help for
cases which dont have symbol names like choice.
Signed-off-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@st.com>
Reviewed-by: default avatarStuart Menefy <stuart.menefy@st.com>
Reviewed-by: default avatarArnaud Lacombe <lacombar@gmail.com>
Cc: stable@kernel.org
Signed-off-by: default avatarMichal Marek <mmarek@suse.cz>
parent 4920e05c
......@@ -597,11 +597,10 @@ void menu_get_ext_help(struct menu *menu, struct gstr *help)
struct symbol *sym = menu->sym;
if (menu_has_help(menu)) {
if (sym->name) {
if (sym->name)
str_printf(help, "%s%s:\n\n", CONFIG_, sym->name);
str_append(help, _(menu_get_help(menu)));
str_append(help, "\n");
}
str_append(help, _(menu_get_help(menu)));
str_append(help, "\n");
} else {
str_append(help, nohelp_text);
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment