Kbuild: kconfig: Verbose version of --listnewconfig

If the KBUILD_VERBOSE environment variable is set to non-zero, show
the default values of new symbols and not just their names.

Based on work by Bastian Blank <waldi@debian.org> and
maximilian attems <max@stro.at>.  Simplified by Michal Marek
<mmarek@suse.cz>.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Gbp-Pq: Topic features/all
Gbp-Pq: Name Kbuild-kconfig-Verbose-version-of-listnewconfig.patch

diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index 866369f10ff84f4d2cae14eb6dfbe7e353c08adf..3f11e74f354a059656f2810e8d860c54b30fe876 100644 (file)
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -369,7 +369,6 @@ static void conf(struct menu *menu)
                switch (prop->type) {
                case P_MENU:
                        if ((input_mode == silentoldconfig ||
-                            input_mode == listnewconfig ||
                             input_mode == olddefconfig) &&
                            rootEntry != menu) {
                                check_conf(menu);
@@ -430,11 +429,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 != olddefconfig) {
+                       if (input_mode != olddefconfig) {
                                if (!conf_cnt++)
                                        printf(_("*\n* Restart config...\n*\n"));
                                rootEntry = menu_get_parent_menu(menu);
@@ -447,6 +442,30 @@ 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;
+
+       if (verbose && menu == &rootmenu) {
+               printf("\n#\n"
+                      "# Changes:\n"
+                      "#\n");
+       }
+
+       sym = menu->sym;
+       if (sym && (sym->flags & SYMBOL_NEW) &&
+           sym_is_changable(sym) && sym->name && !sym_is_choice_value(sym)) {
+               conf_write_new_symbol(stdout, sym, verbose);
+       }
+
+       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},
@@ -494,6 +513,7 @@ int main(int ac, char **av)
        const char *progname = av[0];
        int opt;
        const char *name, *defconfig_file = NULL /* gcc uninit */;
+       const char *value;
        struct stat tmpstat;
 
        setlocale(LC_ALL, "");
@@ -673,16 +693,18 @@ int main(int ac, char **av)
                input_mode = silentoldconfig;
                /* fall through */
        case oldconfig:
-       case listnewconfig:
        case olddefconfig:
        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 != olddefconfig));
+               } while (conf_cnt && input_mode != olddefconfig);
+               break;
+       case listnewconfig:
+               conf_set_all_new_symbols(def_default);
+               value = getenv("KBUILD_VERBOSE");
+               report_conf(&rootmenu, value && atoi(value));
                break;
        }
 

diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index 297b079ae4d9f0decbabc76d0f7e833e20aadadb..56263c015e5d5032f238299bb62e301421904cff 100644 (file)
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -738,6 +738,14 @@ next_menu:
        return 0;
 }
 
+void conf_write_new_symbol(FILE *fp, struct symbol *sym, bool verbose)
+{
+       if (verbose)
+               conf_write_symbol(fp, sym, &kconfig_printer_cb, NULL);
+       else
+               fprintf(fp, "%s%s\n", CONFIG_, sym->name);
+}
+
 int conf_write(const char *name)
 {
        FILE *out;
@@ -1171,7 +1179,10 @@ bool conf_set_all_new_symbols(enum conf_def_mode mode)
        bool has_changed = false;
 
        for_all_symbols(i, sym) {
-               if (sym_has_value(sym) || (sym->flags & SYMBOL_VALID))
+               if (sym_has_value(sym))
+                       continue;
+               sym->flags |= SYMBOL_NEW;
+               if (sym->flags & SYMBOL_VALID)
                        continue;
                switch (sym_get_type(sym)) {
                case S_BOOLEAN:

diff --git a/scripts/kconfig/expr.h b/scripts/kconfig/expr.h
index a73f762c48d6964e1ef7adb97bfea9e8fb471078..a2dba4d8d0b1d0d313e98e64d240c786c469793a 100644 (file)
--- a/scripts/kconfig/expr.h
+++ b/scripts/kconfig/expr.h
@@ -115,6 +115,8 @@ struct symbol {
 /* Set symbol to y if allnoconfig; used for symbols that hide others */
 #define SYMBOL_ALLNOCONFIG_Y 0x200000
 
+#define SYMBOL_NEW        0x400000 /* 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 5d86e2dfae59da1cc187dbd579b74757075f2280..cc0d965672058b350cc355e13c829b1fe3c863c5 100644 (file)
--- a/scripts/kconfig/lkc_proto.h
+++ b/scripts/kconfig/lkc_proto.h
@@ -8,6 +8,7 @@ int conf_read_simple(const char *name, int);
 int conf_write_defconfig(const char *name);
 int conf_write(const char *name);
 int conf_write_autoconf(void);
+void conf_write_new_symbol(FILE*, struct symbol*, bool);
 bool conf_get_changed(void);
 void conf_set_changed_callback(void (*fn)(void));
 void conf_set_message_callback(void (*fn)(const char *fmt, va_list ap));