kconfig: WERROR unmet symbol dependency

[ Upstream commit 15d3f7664d2776c086f813f1efbfe2ae20a85e89 ]

When KCONFIG_WERROR env variable is set treat unmet direct
symbol dependency as a terminal condition (error).

Suggested-by: Stefan Reinauer <reinauer@google.com>
Signed-off-by: Sergey Senozhatsky <senozhatsky@chromium.org>
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Stable-dep-of: a409fc1463d6 ("kconfig: fix memory leak in sym_warn_unmet_dep()")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index 5d84b44a2a2a7169f644742b0b94abec44f805da..ab1c41eb6d035a26d4d1807fc3ce65904e5b6d0f 100644 (file)
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -838,6 +838,9 @@ int main(int ac, char **av)
                break;
        }
 
+       if (conf_errors())
+               exit(1);
+
        if (sync_kconfig) {
                name = getenv("KCONFIG_NOSILENTUPDATE");
                if (name && *name) {
@@ -898,6 +901,9 @@ int main(int ac, char **av)
                break;
        }
 
+       if (sym_dep_errors())
+               exit(1);
+
        if (input_mode == savedefconfig) {
                if (conf_write_defconfig(defconfig_file)) {
                        fprintf(stderr, "n*** Error while saving defconfig to: %s\n\n",

diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index ef9deb1e22f8c41230412e4c91eec7654eda34bd..06d98ca4b612fe68150932945b353fc035d1d5b2 100644 (file)
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -173,6 +173,13 @@ static void conf_message(const char *fmt, ...)
 static const char *conf_filename;
 static int conf_lineno, conf_warnings;
 
+bool conf_errors(void)
+{
+       if (conf_warnings)
+               return getenv("KCONFIG_WERROR");
+       return false;
+}
+
 static void conf_warning(const char *fmt, ...)
 {
        va_list ap;
@@ -351,10 +358,9 @@ int conf_read_simple(const char *name, int def)
        char *p, *p2, *val;
        struct symbol *sym;
        int i, def_flags;
-       const char *warn_unknown, *werror, *sym_name;
+       const char *warn_unknown, *sym_name;
 
        warn_unknown = getenv("KCONFIG_WARN_UNKNOWN_SYMBOLS");
-       werror = getenv("KCONFIG_WERROR");
        if (name) {
                in = zconf_fopen(name);
        } else {
@@ -515,9 +521,6 @@ load:
        free(line);
        fclose(in);
 
-       if (conf_warnings && werror)
-               exit(1);
-
        return 0;
 }
 

diff --git a/scripts/kconfig/lkc_proto.h b/scripts/kconfig/lkc_proto.h
index a11626bdc421c4ef215525439300f4a70008c15a..d7783bc0a4f799941ccca81e533c43d1855f048a 100644 (file)
--- a/scripts/kconfig/lkc_proto.h
+++ b/scripts/kconfig/lkc_proto.h
@@ -12,6 +12,7 @@ void conf_set_changed(bool val);
 bool conf_get_changed(void);
 void conf_set_changed_callback(void (*fn)(void));
 void conf_set_message_callback(void (*fn)(const char *s));
+bool conf_errors(void);
 
 /* symbol.c */
 extern struct symbol * symbol_hash[SYMBOL_HASHSIZE];
@@ -22,6 +23,7 @@ const char * sym_escape_string_value(const char *in);
 struct symbol ** sym_re_search(const char *pattern);
 const char * sym_type_name(enum symbol_type type);
 void sym_calc_value(struct symbol *sym);
+bool sym_dep_errors(void);
 enum symbol_type sym_get_type(struct symbol *sym);
 bool sym_tristate_within_range(struct symbol *sym,tristate tri);
 bool sym_set_tristate_value(struct symbol *sym,tristate tri);

diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c
index f9786621a178ea0e2fcf69c003fc69af03748fa9..15d958ba998800bf661b87ad5c7009f61e00b5c9 100644 (file)
--- a/scripts/kconfig/symbol.c
+++ b/scripts/kconfig/symbol.c
@@ -40,6 +40,7 @@ static struct symbol symbol_empty = {
 
 struct symbol *modules_sym;
 static tristate modules_val;
+static int sym_warnings;
 
 enum symbol_type sym_get_type(struct symbol *sym)
 {
@@ -320,6 +321,14 @@ static void sym_warn_unmet_dep(struct symbol *sym)
                               "  Selected by [m]:\n");
 
        fputs(str_get(&gs), stderr);
+       sym_warnings++;
+}
+
+bool sym_dep_errors(void)
+{
+       if (sym_warnings)
+               return getenv("KCONFIG_WERROR");
+       return false;
 }
 
 void sym_calc_value(struct symbol *sym)