[coreboot-gerrit] Patch set updated for coreboot: util/kconfig: Ignore extra symbols in configs instead of failing

Martin Roth (martinroth@google.com) gerrit at coreboot.org
Thu Feb 11 03:53:15 CET 2016


Martin Roth (martinroth at google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/13674

-gerrit

commit 0d48c1645fdb13e122e5d1e17c1c40d19523b66b
Author: Martin Roth <martinroth at google.com>
Date:   Wed Feb 10 16:06:00 2016 -0700

    util/kconfig: Ignore extra symbols in configs instead of failing
    
    When updating an old .config file that has a symbol that has been
    removed from the current Kconfig tree, kconfig will generate a warning
    and fail to save the updated file.  This is incredibly annoying, and
    not the goal when trying to eliminate Kconfig warnings.
    
    Instead of generating a warning, just print a message that it's being
    ignored.  This will remove the offending symbol, while allowing the
    updated config file to be saved.
    
    Split the change from 1 line to 3 lines to keep it at 80 characters.
    
    Change-Id: I09d5775c9ed14bde80077b51b862a7f41bee098a
    Signed-off-by: Martin Roth <martinroth at google.com>
---
 util/kconfig/confdata.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/util/kconfig/confdata.c b/util/kconfig/confdata.c
index e582463..436d735 100644
--- a/util/kconfig/confdata.c
+++ b/util/kconfig/confdata.c
@@ -362,7 +362,9 @@ load:
 			if (def == S_DEF_USER) {
 				sym = sym_find(line + strlen(CONFIG_));
 				if (!sym) {
-					conf_warning("trying to assign non-existent symbol %s", line + strlen(CONFIG_));
+					conf_message(
+						"ignoring nonexistent symbol %s",
+						line + strlen(CONFIG_));
 					sym_add_change_count(1);
 					goto setsym;
 				}



More information about the coreboot-gerrit mailing list