kconfig: WERROR unmet symbol dependency

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>

diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index 33d19e419908b8315603f04db41189ed9c506a0c..662a5e7c37c28539ce7104085478c718848c4fc3 100644 (file)
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -827,6 +827,9 @@ int main(int ac, char **av)
                break;
        }
 
+       if (conf_errors())
+               exit(1);
+
        if (sync_kconfig) {
                name = getenv("KCONFIG_NOSILENTUPDATE");
                if (name && *name) {
@@ -890,6 +893,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 f1197e67243161db800ef81e111b374a85a7056a..f53dcdd445976aa8759e13e6e3103ef02f76ead1 100644 (file)
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -155,6 +155,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;
@@ -365,10 +372,9 @@ int conf_read_simple(const char *name, int def)
        char *p, *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 {
@@ -525,9 +531,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 687d8698d801c6878ae56ac9dd29d4e6f1027e68..a4ae5e9eadadb8758b5911d0f38c028b0622d937 100644 (file)
--- a/scripts/kconfig/lkc_proto.h
+++ b/scripts/kconfig/lkc_proto.h
@@ -15,6 +15,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];
@@ -25,6 +26,7 @@ void print_symbol_for_listconfig(struct symbol *sym);
 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 a5a4f9153eb7377aaa1970faa148ad6503ffc6bf..3e808528aaeab2625424b56247eed97fa107232d 100644 (file)
--- a/scripts/kconfig/symbol.c
+++ b/scripts/kconfig/symbol.c
@@ -31,6 +31,7 @@ struct symbol symbol_no = {
 
 struct symbol *modules_sym;
 static tristate modules_val;
+static int sym_warnings;
 
 enum symbol_type sym_get_type(struct symbol *sym)
 {
@@ -311,6 +312,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)