merge from upstream for systems that dont integrate libintl into their C library:

[oweals/busybox.git] / scripts / kconfig / confdata.c

diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index f3f76dd999a7e15f03475a538d8739bcb105cd8e..4837f61d96bad3d480955e18e46e8e34b16019d9 100644 (file)
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -25,10 +25,7 @@ const char conf_def_filename[] = ".config";
 const char conf_defname[] = "scripts/defconfig";
 
 const char *conf_confnames[] = {
-       ".config",
-       "/lib/modules/$UNAME_RELEASE/.config",
-       "/etc/busybox-config",
-       "/boot/config-$UNAME_RELEASE",
+       conf_def_filename,
        conf_defname,
        NULL,
 };
@@ -225,7 +222,8 @@ int conf_read_simple(const char *name)
                                        sym->user.val = strdup(p);
                                        sym->flags &= ~SYMBOL_NEW;
                                } else {
-                                       conf_warning("symbol value '%s' invalid for %s", p, sym->name);
+                                       if (p[0]) /* bbox */
+                                               conf_warning("symbol value '%s' invalid for %s", p, sym->name);
                                        continue;
                                }
                                break;