util/kconfig/patches/0007-kconfig-Allow-KCONFIG_STRICT-outside-of-confdata.c.patch

   1 From:   Sergey Senozhatsky <senozhatsky@chromium.org>
   2 To:     Masahiro Yamada <masahiroy@kernel.org>
   3 Cc:     Patrick Georgi <pgeorgi@google.com>, linux-kbuild@vger.kernel.org,
   4         linux-kernel@vger.kernel.org,
   5         Sergey Senozhatsky <senozhatsky@chromium.org>,
   6         Stefan Reinauer <reinauer@google.com>
   7 Subject: [PATCH] kconfig: WERROR unmet symbol dependency
   8 Date:   Wed, 22 Nov 2023 12:47:45 +0900
   9 Message-ID: <20231122034753.1446513-1-senozhatsky@chromium.org>
  10 MIME-Version: 1.0
  11 Content-Transfer-Encoding: 8bit
  12 List-ID: <linux-kernel.vger.kernel.org>
  13 X-Mailing-List: linux-kernel@vger.kernel.org
  14
  15 When KCONFIG_WERROR env variable is set treat unmet direct
  16 symbol dependency as a terminal condition (error).
  17
  18 Suggested-by: Stefan Reinauer <reinauer@google.com>
  19 Signed-off-by: Sergey Senozhatsky <senozhatsky@chromium.org>
  20 ---
  21  scripts/kconfig/symbol.c | 9 ++++++++-
  22  1 file changed, 8 insertions(+), 1 deletion(-)
  23
  24 Index: kconfig/symbol.c
  25 ===================================================================
  26 --- kconfig.orig/symbol.c
  27 +++ kconfig/symbol.c
  28 @@ -37,6 +37,7 @@ static struct symbol symbol_empty = {
  29
  30  struct symbol *modules_sym;
  31  static tristate modules_val;
  32 +static int sym_warnings;
  33
  34  enum symbol_type sym_get_type(struct symbol *sym)
  35  {
  36 @@ -317,12 +318,14 @@ static void sym_warn_unmet_dep(struct sy
  37                                "  Selected by [m]:\n");
  38
  39         fputs(str_get(&gs), stderr);
  40 +       sym_warnings++;
  41  }
  42
  43  void sym_calc_value(struct symbol *sym)
  44  {
  45         struct symbol_value newval, oldval;
  46         struct property *prop;
  47 +       const char *werror;
  48         struct expr *e;
  49
  50         if (!sym)
  51 @@ -338,8 +341,9 @@ void sym_calc_value(struct symbol *sym)
  52                 sym_calc_value(prop_get_symbol(prop));
  53         }
  54
  55 +       werror = getenv("KCONFIG_WERROR");
  56 +       sym_warnings = 0;
  57         sym->flags |= SYMBOL_VALID;
  58 -
  59         oldval = sym->curr;
  60
  61         switch (sym->type) {
  62 @@ -430,6 +434,9 @@ void sym_calc_value(struct symbol *sym)
  63                 ;
  64         }
  65
  66 +       if (sym_warnings && werror)
  67 +               exit(1);
  68 +
  69         sym->curr = newval;
  70         if (sym_is_choice(sym) && newval.tri == yes)
  71                 sym->curr.val = sym_calc_choice(sym);