Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

Pull kconfig changes from Michal Marek:

 - Error handling for make KCONFIG_ALLCONFIG=<...> all*config plus a fix
   for a bug that was exposed by this

 - Fix for the script/config utility.

* 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  scripts/config: properly report and set string options
  kbuild: all{no,yes,mod,def,rand}config only read files when instructed to.
  kconfig: Add error handling to KCONFIG_ALLCONFIG

1 files changed, 16 insertions, 6 deletions

diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index f208f900ed3a..0dc4a2c779b1 100644
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -574,8 +574,15 @@ int main(int ac, char **av)
         case alldefconfig:
         case randconfig:
                 name = getenv("KCONFIG_ALLCONFIG");
-                if (name && !stat(name, &tmpstat)) {
-                        conf_read_simple(name, S_DEF_USER);
+                if (!name)
+                        break;
+                if ((strcmp(name, "") != 0) && (strcmp(name, "1") != 0)) {
+                        if (conf_read_simple(name, S_DEF_USER)) {
+                                fprintf(stderr,
+                                        _("*** Can't read seed configuration \"%s\"!\n"),
+                                        name);
+                                exit(1);
+                        }
                         break;
                 }
                 switch (input_mode) {
@@ -586,10 +593,13 @@ int main(int ac, char **av)
                 case randconfig:        name = "allrandom.config"; break;
                 default: break;
                 }
-                if (!stat(name, &tmpstat))
-                        conf_read_simple(name, S_DEF_USER);
-                else if (!stat("all.config", &tmpstat))
-                        conf_read_simple("all.config", S_DEF_USER);
+                if (conf_read_simple(name, S_DEF_USER) &&
+                    conf_read_simple("all.config", S_DEF_USER)) {
+                        fprintf(stderr,
+                                _("*** KCONFIG_ALLCONFIG set, but no \"%s\" or \"all.config\" file found\n"),
+                                name);
+                        exit(1);
+                }
                 break;
         default:
                 break;