diff options
Diffstat (limited to 'scripts/kconfig/conf.c')
-rw-r--r-- | scripts/kconfig/conf.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c index d6cfa0ffbaf0..eba5906dc4ab 100644 --- a/scripts/kconfig/conf.c +++ b/scripts/kconfig/conf.c | |||
@@ -508,8 +508,7 @@ int main(int ac, char **av) | |||
508 | name = conf_get_configname(); | 508 | name = conf_get_configname(); |
509 | if (stat(name, &tmpstat)) { | 509 | if (stat(name, &tmpstat)) { |
510 | fprintf(stderr, _("***\n" | 510 | fprintf(stderr, _("***\n" |
511 | "*** You have not yet configured your kernel!\n" | 511 | "*** Configuration file \"%s\" not found!\n" |
512 | "*** (missing kernel config file \"%s\")\n" | ||
513 | "***\n" | 512 | "***\n" |
514 | "*** Please run some configurator (e.g. \"make oldconfig\" or\n" | 513 | "*** Please run some configurator (e.g. \"make oldconfig\" or\n" |
515 | "*** \"make menuconfig\" or \"make xconfig\").\n" | 514 | "*** \"make menuconfig\" or \"make xconfig\").\n" |
@@ -571,7 +570,7 @@ int main(int ac, char **av) | |||
571 | name = getenv("KCONFIG_NOSILENTUPDATE"); | 570 | name = getenv("KCONFIG_NOSILENTUPDATE"); |
572 | if (name && *name) { | 571 | if (name && *name) { |
573 | fprintf(stderr, | 572 | fprintf(stderr, |
574 | _("\n*** Kernel configuration requires explicit update.\n\n")); | 573 | _("\n*** The configuration requires explicit update.\n\n")); |
575 | return 1; | 574 | return 1; |
576 | } | 575 | } |
577 | } | 576 | } |
@@ -623,11 +622,11 @@ int main(int ac, char **av) | |||
623 | * All other commands are only used to generate a config. | 622 | * All other commands are only used to generate a config. |
624 | */ | 623 | */ |
625 | if (conf_get_changed() && conf_write(NULL)) { | 624 | if (conf_get_changed() && conf_write(NULL)) { |
626 | fprintf(stderr, _("\n*** Error during writing of the kernel configuration.\n\n")); | 625 | fprintf(stderr, _("\n*** Error during writing of the configuration.\n\n")); |
627 | exit(1); | 626 | exit(1); |
628 | } | 627 | } |
629 | if (conf_write_autoconf()) { | 628 | if (conf_write_autoconf()) { |
630 | fprintf(stderr, _("\n*** Error during update of the kernel configuration.\n\n")); | 629 | fprintf(stderr, _("\n*** Error during update of the configuration.\n\n")); |
631 | return 1; | 630 | return 1; |
632 | } | 631 | } |
633 | } else if (input_mode == savedefconfig) { | 632 | } else if (input_mode == savedefconfig) { |
@@ -638,7 +637,7 @@ int main(int ac, char **av) | |||
638 | } | 637 | } |
639 | } else if (input_mode != listnewconfig) { | 638 | } else if (input_mode != listnewconfig) { |
640 | if (conf_write(NULL)) { | 639 | if (conf_write(NULL)) { |
641 | fprintf(stderr, _("\n*** Error during writing of the kernel configuration.\n\n")); | 640 | fprintf(stderr, _("\n*** Error during writing of the configuration.\n\n")); |
642 | exit(1); | 641 | exit(1); |
643 | } | 642 | } |
644 | } | 643 | } |