From patchwork Mon Dec 6 00:50:49 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Hutchings X-Patchwork-Id: 376912 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oB60p3Ko011100 for ; Mon, 6 Dec 2010 00:51:03 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752331Ab0LFAvD (ORCPT ); Sun, 5 Dec 2010 19:51:03 -0500 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:37061 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750891Ab0LFAvC convert rfc822-to-8bit (ORCPT ); Sun, 5 Dec 2010 19:51:02 -0500 Received: from [192.168.4.185] (helo=localhost) by shadbolt.decadent.org.uk with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1PPPI3-0005bu-Uk; Mon, 06 Dec 2010 00:50:52 +0000 Received: from ben by localhost with local (Exim 4.72) (envelope-from ) id 1PPPI2-0006NY-Gm; Mon, 06 Dec 2010 00:50:50 +0000 From: Ben Hutchings To: Michal Marek , Roman Zippel Cc: Arnaud Lacombe , linux-kbuild@vger.kernel.org, Debian kernel maintainers Date: Mon, 06 Dec 2010 00:50:49 +0000 Message-ID: <1291596649.8025.104.camel@localhost> Mime-Version: 1.0 X-Mailer: Evolution 2.30.3 X-SA-Exim-Connect-IP: 192.168.4.185 X-SA-Exim-Mail-From: ben@decadent.org.uk X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on shadbolt.decadent.org.uk X-Spam-Level: X-Spam-Status: No, score=-1.4 required=5.0 tests=ALL_TRUSTED,AWL autolearn=disabled version=3.2.5 Subject: [PATCHv3] Kbuild: kconfig: Verbose version of --listnewconfig X-SA-Exim-Version: 4.2.1 (built Wed, 25 Jun 2008 17:14:11 +0000) X-SA-Exim-Scanned: Yes (on shadbolt.decadent.org.uk) Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Mon, 06 Dec 2010 00:51:03 +0000 (UTC) diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c index 5459a38..31e4e7d 100644 --- a/scripts/kconfig/conf.c +++ b/scripts/kconfig/conf.c @@ -363,7 +363,6 @@ static void conf(struct menu *menu) switch (prop->type) { case P_MENU: if ((input_mode == silentoldconfig || - input_mode == listnewconfig || input_mode == oldnoconfig) && rootEntry != menu) { check_conf(menu); @@ -423,11 +422,7 @@ static void check_conf(struct menu *menu) if (sym && !sym_has_value(sym)) { if (sym_is_changable(sym) || (sym_is_choice(sym) && sym_get_tristate_value(sym) == yes)) { - if (input_mode == listnewconfig) { - if (sym->name && !sym_is_choice_value(sym)) { - printf("%s%s\n", CONFIG_, sym->name); - } - } else if (input_mode != oldnoconfig) { + if (input_mode != oldnoconfig) { if (!conf_cnt++) printf(_("*\n* Restart config...\n*\n")); rootEntry = menu_get_parent_menu(menu); @@ -440,6 +435,27 @@ static void check_conf(struct menu *menu) check_conf(child); } +static void report_conf(struct menu *menu, bool verbose) +{ + struct symbol *sym; + struct menu *child; + + if (!menu_is_visible(menu)) + return; + + sym = menu->sym; + if (sym && (sym->flags & SYMBOL_NEW) && + sym_is_changable(sym) && sym->name && !sym_is_choice_value(sym)) { + if (verbose) + conf_write_symbol(sym, sym->type, stdout, true); + else + printf("%s%s\n", CONFIG_, sym->name); + } + + for (child = menu->list; child; child = child->next) + report_conf(child, verbose); +} + static struct option long_opts[] = { {"oldaskconfig", no_argument, NULL, oldaskconfig}, {"oldconfig", no_argument, NULL, oldconfig}, @@ -604,16 +620,17 @@ int main(int ac, char **av) input_mode = silentoldconfig; /* fall through */ case oldconfig: - case listnewconfig: case oldnoconfig: case silentoldconfig: /* Update until a loop caused no more changes */ do { conf_cnt = 0; check_conf(&rootmenu); - } while (conf_cnt && - (input_mode != listnewconfig && - input_mode != oldnoconfig)); + } while (conf_cnt && input_mode != oldnoconfig); + break; + case listnewconfig: + conf_set_all_new_symbols(def_default); + report_conf(&rootmenu, getenv("KCONFIG_VERBOSE") != NULL); break; } diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c index c06f150..fbbacac 100644 --- a/scripts/kconfig/confdata.c +++ b/scripts/kconfig/confdata.c @@ -440,8 +440,8 @@ static void conf_write_string(bool headerfile, const char *name, fputs("\"\n", out); } -static void conf_write_symbol(struct symbol *sym, enum symbol_type type, - FILE *out, bool write_no) +void conf_write_symbol(struct symbol *sym, enum symbol_type type, + FILE *out, bool write_no) { const char *str; @@ -1009,6 +1009,7 @@ void conf_set_all_new_symbols(enum conf_def_mode mode) for_all_symbols(i, sym) { if (sym_has_value(sym)) continue; + sym->flags |= SYMBOL_NEW; switch (sym_get_type(sym)) { case S_BOOLEAN: case S_TRISTATE: diff --git a/scripts/kconfig/expr.h b/scripts/kconfig/expr.h index 184eb6a..b267933 100644 --- a/scripts/kconfig/expr.h +++ b/scripts/kconfig/expr.h @@ -108,6 +108,8 @@ struct symbol { #define SYMBOL_DEF3 0x40000 /* symbol.def[S_DEF_3] is valid */ #define SYMBOL_DEF4 0x80000 /* symbol.def[S_DEF_4] is valid */ +#define SYMBOL_NEW 0x100000 /* symbol is new (loaded config did not provide a value) */ + #define SYMBOL_MAXLENGTH 256 #define SYMBOL_HASHSIZE 9973 diff --git a/scripts/kconfig/lkc_proto.h b/scripts/kconfig/lkc_proto.h index 17342fe..6da571b 100644 --- a/scripts/kconfig/lkc_proto.h +++ b/scripts/kconfig/lkc_proto.h @@ -7,6 +7,7 @@ P(conf_read_simple,int,(const char *name, int)); P(conf_write_defconfig,int,(const char *name)); P(conf_write,int,(const char *name)); P(conf_write_autoconf,int,(void)); +P(conf_write_symbol, void,(struct symbol*, enum symbol_type, FILE*, bool)); P(conf_get_changed,bool,(void)); P(conf_set_changed_callback, void,(void (*fn)(void))); P(conf_set_message_callback, void,(void (*fn)(const char *fmt, va_list ap)));