Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

kconfig: Do not print status messages in make -s mode

Browse source 
Add an -s option to the various frontends and pass it when make -s is
used. Also, use $(kecho) instead of @echo in the Makefile.

Signed-off-by: Michal Marek <mmarek@suse.cz>
This commit is contained in:
Michal Marek 2015-04-08 13:30:42 +02:00
parent 1cba0c3057
commit 0a1f00a1c8
6 changed files with 62 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
scripts/kconfig/Makefile
View file

@ -11,27 +11,31 @@ else
Kconfig := Kconfig Kconfig := Kconfig
endif endif
ifeq ($(quiet),silent_)
silent := -s
endif
# We need this, in case the user has it in its environment # We need this, in case the user has it in its environment
unexport CONFIG_ unexport CONFIG_
xconfig: $(obj)/qconf xconfig: $(obj)/qconf
$< $(Kconfig) $< $(silent) $(Kconfig)
gconfig: $(obj)/gconf gconfig: $(obj)/gconf
$< $(Kconfig) $< $(silent) $(Kconfig)
menuconfig: $(obj)/mconf menuconfig: $(obj)/mconf
$< $(Kconfig) $< $(silent) $(Kconfig)
config: $(obj)/conf config: $(obj)/conf
$< --oldaskconfig $(Kconfig) $< $(silent) --oldaskconfig $(Kconfig)
nconfig: $(obj)/nconf nconfig: $(obj)/nconf
$< $(Kconfig) $< $(silent) $(Kconfig)
silentoldconfig: $(obj)/conf silentoldconfig: $(obj)/conf
$(Q)mkdir -p include/config include/generated $(Q)mkdir -p include/config include/generated
$< --$@ $(Kconfig) $< $(silent) --$@ $(Kconfig)
localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf
$(Q)mkdir -p include/config include/generated $(Q)mkdir -p include/config include/generated
@ -40,18 +44,18 @@ localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf
cmp -s .tmp.config .config || \ cmp -s .tmp.config .config || \
(mv -f .config .config.old.1; \ (mv -f .config .config.old.1; \
mv -f .tmp.config .config; \ mv -f .tmp.config .config; \
$(obj)/conf --silentoldconfig $(Kconfig); \ $(obj)/conf $(silent) --silentoldconfig $(Kconfig); \
mv -f .config.old.1 .config.old) \ mv -f .config.old.1 .config.old) \
else \ else \
mv -f .tmp.config .config; \ mv -f .tmp.config .config; \
$(obj)/conf --silentoldconfig $(Kconfig); \ $(obj)/conf $(silent) --silentoldconfig $(Kconfig); \
fi fi
$(Q)rm -f .tmp.config $(Q)rm -f .tmp.config
# Create new linux.pot file # Create new linux.pot file
# Adjust charset to UTF-8 in .po file to accept UTF-8 in Kconfig files # Adjust charset to UTF-8 in .po file to accept UTF-8 in Kconfig files
update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h
$(Q)echo " GEN config.pot" $(Q)$(kecho) " GEN config.pot"
$(Q)xgettext --default-domain=linux \ $(Q)xgettext --default-domain=linux \
--add-comments --keyword=_ --keyword=N_ \ --add-comments --keyword=_ --keyword=N_ \
--from-code=UTF-8 \ --from-code=UTF-8 \
@ -62,11 +66,11 @@ update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h
$(Q)(for i in `ls $(srctree)/arch/*/Kconfig \ $(Q)(for i in `ls $(srctree)/arch/*/Kconfig \
$(srctree)/arch/*/um/Kconfig`; \ $(srctree)/arch/*/um/Kconfig`; \
do \ do \
echo " GEN $$i"; \ $(kecho) " GEN $$i"; \
$(obj)/kxgettext $$i \ $(obj)/kxgettext $$i \
>> $(obj)/config.pot; \ >> $(obj)/config.pot; \
done ) done )
$(Q)echo " GEN linux.pot" $(Q)$(kecho) " GEN linux.pot"
$(Q)msguniq --sort-by-file --to-code=UTF-8 $(obj)/config.pot \ $(Q)msguniq --sort-by-file --to-code=UTF-8 $(obj)/config.pot \
--output $(obj)/linux.pot --output $(obj)/linux.pot
$(Q)rm -f $(obj)/config.pot $(Q)rm -f $(obj)/config.pot
@ -77,7 +81,7 @@ simple-targets := oldconfig allnoconfig allyesconfig allmodconfig \
PHONY += $(simple-targets) PHONY += $(simple-targets)
$(simple-targets): $(obj)/conf $(simple-targets): $(obj)/conf
$< --$@ $(Kconfig) $< $(silent) --$@ $(Kconfig)
PHONY += oldnoconfig savedefconfig defconfig PHONY += oldnoconfig savedefconfig defconfig
@ -87,18 +91,18 @@ PHONY += oldnoconfig savedefconfig defconfig
oldnoconfig: olddefconfig oldnoconfig: olddefconfig
savedefconfig: $(obj)/conf savedefconfig: $(obj)/conf
$< --$@=defconfig $(Kconfig) $< $(silent) --$@=defconfig $(Kconfig)
defconfig: $(obj)/conf defconfig: $(obj)/conf
ifeq ($(KBUILD_DEFCONFIG),) ifeq ($(KBUILD_DEFCONFIG),)
$< --defconfig $(Kconfig) $< $(silent) --defconfig $(Kconfig)
else else
@echo "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'" @$(kecho) "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'"
$(Q)$< --defconfig=arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig) $(Q)$< $(silent) --defconfig=arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig)
endif endif
%_defconfig: $(obj)/conf %_defconfig: $(obj)/conf
$(Q)$< --defconfig=arch/$(SRCARCH)/configs/$@ $(Kconfig) $(Q)$< $(silent) --defconfig=arch/$(SRCARCH)/configs/$@ $(Kconfig)
configfiles=$(wildcard $(srctree)/kernel/configs/$@ $(srctree)/arch/$(SRCARCH)/configs/$@) configfiles=$(wildcard $(srctree)/kernel/configs/$@ $(srctree)/arch/$(SRCARCH)/configs/$@)
@ -215,7 +219,7 @@ $(obj)/.tmp_qtcheck: $(src)/Makefile
# QT needs some extra effort... # QT needs some extra effort...
$(obj)/.tmp_qtcheck: $(obj)/.tmp_qtcheck:
@set -e; echo " CHECK qt"; dir=""; pkg=""; \ @set -e; $(kecho) " CHECK qt"; dir=""; pkg=""; \
if ! pkg-config --exists QtCore 2> /dev/null; then \ if ! pkg-config --exists QtCore 2> /dev/null; then \
echo "* Unable to find the QT4 tool qmake. Trying to use QT3"; \ echo "* Unable to find the QT4 tool qmake. Trying to use QT3"; \
pkg-config --exists qt 2> /dev/null && pkg=qt; \ pkg-config --exists qt 2> /dev/null && pkg=qt; \

8
scripts/kconfig/conf.c
View file

@ -471,7 +471,7 @@ static struct option long_opts[] = {
static void conf_usage(const char *progname) static void conf_usage(const char *progname)
{ {
printf("Usage: %s [option] <kconfig-file>\n", progname); printf("Usage: %s [-s] [option] <kconfig-file>\n", progname);
printf("[option] is _one_ of the following:\n"); printf("[option] is _one_ of the following:\n");
printf(" --listnewconfig List new options\n"); printf(" --listnewconfig List new options\n");
printf(" --oldaskconfig Start a new configuration using a line-oriented program\n"); printf(" --oldaskconfig Start a new configuration using a line-oriented program\n");
@ -501,7 +501,11 @@ int main(int ac, char **av)
tty_stdio = isatty(0) && isatty(1) && isatty(2); tty_stdio = isatty(0) && isatty(1) && isatty(2);
while ((opt = getopt_long(ac, av, "", long_opts, NULL)) != -1) { while ((opt = getopt_long(ac, av, "s", long_opts, NULL)) != -1) {
if (opt == 's') {
conf_set_message_callback(NULL);
continue;
}
input_mode = (enum input_mode)opt; input_mode = (enum input_mode)opt;
switch (opt) { switch (opt) {
case silentoldconfig: case silentoldconfig:

5
scripts/kconfig/gconf.c
View file

@ -1474,9 +1474,12 @@ int main(int ac, char *av[])
case 'a': case 'a':
//showAll = 1; //showAll = 1;
break; break;
case 's':
conf_set_message_callback(NULL);
break;
case 'h': case 'h':
case '?': case '?':
printf("%s <config>\n", av[0]); printf("%s [-s] <config>\n", av[0]);
exit(0); exit(0);
} }
name = av[2]; name = av[2];

31
scripts/kconfig/mconf.c
View file

@ -279,6 +279,7 @@ static int child_count;
static int single_menu_mode; static int single_menu_mode;
static int show_all_options; static int show_all_options;
static int save_and_exit; static int save_and_exit;
static int silent;
static void conf(struct menu *menu, struct menu *active_menu); static void conf(struct menu *menu, struct menu *active_menu);
static void conf_choice(struct menu *menu); static void conf_choice(struct menu *menu);
@ -777,10 +778,12 @@ static void conf_message_callback(const char *fmt, va_list ap)
char buf[PATH_MAX+1]; char buf[PATH_MAX+1];
vsnprintf(buf, sizeof(buf), fmt, ap); vsnprintf(buf, sizeof(buf), fmt, ap);
if (save_and_exit) if (save_and_exit) {
printf("%s", buf); if (!silent)
else printf("%s", buf);
} else {
show_textbox(NULL, buf, 6, 60); show_textbox(NULL, buf, 6, 60);
}
} }
static void show_help(struct menu *menu) static void show_help(struct menu *menu)
@ -977,16 +980,18 @@ static int handle_exit(void)
} }
/* fall through */ /* fall through */
case -1: case -1:
printf(_("\n\n" if (!silent)
"*** End of the configuration.\n" printf(_("\n\n"
"*** Execute 'make' to start the build or try 'make help'." "*** End of the configuration.\n"
"\n\n")); "*** Execute 'make' to start the build or try 'make help'."
"\n\n"));
res = 0; res = 0;
break; break;
default: default:
fprintf(stderr, _("\n\n" if (!silent)
"Your configuration changes were NOT saved." fprintf(stderr, _("\n\n"
"\n\n")); "Your configuration changes were NOT saved."
"\n\n"));
if (res != KEY_ESC) if (res != KEY_ESC)
res = 0; res = 0;
} }
@ -1010,6 +1015,12 @@ int main(int ac, char **av)
signal(SIGINT, sig_handler); signal(SIGINT, sig_handler);
if (ac > 1 && strcmp(av[1], "-s") == 0) {
silent = 1;
/* Silence conf_read() until the real callback is set up */
conf_set_message_callback(NULL);
av++;
}
conf_parse(av[1]); conf_parse(av[1]);
conf_read(NULL); conf_read(NULL);

5
scripts/kconfig/nconf.c
View file

@ -1482,6 +1482,11 @@ int main(int ac, char **av)
bindtextdomain(PACKAGE, LOCALEDIR); bindtextdomain(PACKAGE, LOCALEDIR);
textdomain(PACKAGE); textdomain(PACKAGE);
if (ac > 1 && strcmp(av[1], "-s") == 0) {
/* Silence conf_read() until the real callback is set up */
conf_set_message_callback(NULL);
av++;
}
conf_parse(av[1]); conf_parse(av[1]);
conf_read(NULL); conf_read(NULL);

5
scripts/kconfig/qconf.cc
View file

@ -1746,7 +1746,7 @@ static const char *progname;
static void usage(void) static void usage(void)
{ {
printf(_("%s <config>\n"), progname); printf(_("%s [-s] <config>\n"), progname);
exit(0); exit(0);
} }
@ -1762,6 +1762,9 @@ int main(int ac, char** av)
configApp = new QApplication(ac, av); configApp = new QApplication(ac, av);
if (ac > 1 && av[1][0] == '-') { if (ac > 1 && av[1][0] == '-') {
switch (av[1][1]) { switch (av[1][1]) {
case 's':
conf_set_message_callback(NULL);
break;
case 'h': case 'h':
case '?': case '?':
usage(); usage();