enum input_mode {
oldaskconfig,
+ syncconfig,
oldconfig,
allnoconfig,
allyesconfig,
defconfig,
savedefconfig,
listnewconfig,
+ olddefconfig,
};
static enum input_mode input_mode = oldaskconfig;
static int indent = 1;
static int tty_stdio;
+static int sync_kconfig;
static int conf_cnt;
static char line[PATH_MAX];
static struct menu *rootEntry;
switch (input_mode) {
case oldconfig:
+ case syncconfig:
if (sym_has_value(sym)) {
printf("%s\n", def);
return 0;
printf("[1-%d?]: ", cnt);
switch (input_mode) {
case oldconfig:
+ case syncconfig:
if (!is_new) {
cnt = def;
printf("%d\n", cnt);
}
static struct option long_opts[] = {
- {"askconfig", no_argument, NULL, oldaskconfig},
- {"config", no_argument, NULL, oldconfig},
+ {"oldaskconfig", no_argument, NULL, oldaskconfig},
+ {"oldconfig", no_argument, NULL, oldconfig},
+ {"syncconfig", no_argument, NULL, syncconfig},
{"defconfig", optional_argument, NULL, defconfig},
{"savedefconfig", required_argument, NULL, savedefconfig},
{"allnoconfig", no_argument, NULL, allnoconfig},
{"alldefconfig", no_argument, NULL, alldefconfig},
{"randconfig", no_argument, NULL, randconfig},
{"listnewconfig", no_argument, NULL, listnewconfig},
+ {"olddefconfig", no_argument, NULL, olddefconfig},
{NULL, 0, NULL, 0}
};
printf("Usage: %s [-s] [option] <kconfig-file>\n", progname);
printf("[option] is _one_ of the following:\n");
printf(" --listnewconfig List new options\n");
- printf(" --askconfig Start a new configuration using a line-oriented program\n");
- printf(" --config Update a configuration using a provided .config as base\n");
- printf(" --silentconfig Same as config, but quietly, additionally update deps\n");
- printf(" --noconfig Same as silentconfig but set new symbols to no\n");
+ printf(" --oldaskconfig Start a new configuration using a line-oriented program\n");
+ printf(" --oldconfig Update a configuration using a provided .config as base\n");
+ printf(" --syncconfig Similar to oldconfig but generates configuration in\n"
+ " include/{generated/,config/}\n");
+ printf(" --olddefconfig Same as oldconfig but sets new symbols to their default value\n");
printf(" --defconfig <file> New config with default defined in <file>\n");
printf(" --savedefconfig <file> Save the minimal current configuration to <file>\n");
printf(" --allnoconfig New config where all options are answered with no\n");
* Suppress distracting "configuration written to ..."
*/
conf_set_message_callback(NULL);
- sync_kconfig = 1;
- break
+ sync_kconfig = 1;
+ break;
case defconfig:
case savedefconfig:
defconfig_file = optarg;
case allmodconfig:
case alldefconfig:
case listnewconfig:
+ case olddefconfig:
break;
case '?':
conf_usage(progname);
name = av[optind];
conf_parse(name);
//zconfdump(stdout);
+ if (sync_kconfig) {
+ name = conf_get_configname();
+ if (stat(name, &tmpstat)) {
+ fprintf(stderr, "***\n"
+ "*** Configuration file \"%s\" not found!\n"
+ "***\n"
+ "*** Please run some configurator (e.g. \"make oldconfig\" or\n"
+ "*** \"make menuconfig\" or \"make xconfig\").\n"
+ "***\n", name);
+ exit(1);
+ }
+ }
switch (input_mode) {
case defconfig:
}
break;
case savedefconfig:
+ case syncconfig:
case oldaskconfig:
case oldconfig:
case listnewconfig:
+ case olddefconfig:
conf_read(NULL);
break;
case allnoconfig:
break;
}
+ if (sync_kconfig) {
+ name = getenv("KCONFIG_NOSILENTUPDATE");
+ if (name && *name) {
+ if (conf_get_changed()) {
+ fprintf(stderr,
+ "\n*** The configuration requires explicit update.\n\n");
+ return 1;
+ }
+ no_conf_write = 1;
+ }
+ }
+
switch (input_mode) {
case allnoconfig:
conf_set_all_new_symbols(def_no);
/* fall through */
case oldconfig:
case listnewconfig:
+ case syncconfig:
/* Update until a loop caused no more changes */
do {
conf_cnt = 0;
check_conf(&rootmenu);
} while (conf_cnt);
break;
+ case olddefconfig:
+ default:
+ break;
}
if (input_mode == savedefconfig) {
return 1;
}
} else if (input_mode != listnewconfig) {
- /*
- * build so we shall update autoconf.
- */
if (!no_conf_write && conf_write(NULL)) {
fprintf(stderr, "\n*** Error during writing of the configuration.\n\n");
exit(1);
}
- if (conf_write_autoconf()) {
- fprintf(stderr, "\n*** Error during update of the configuration.\n\n");
+
+ /*
+ * Create auto.conf if it does not exist.
+ * This prevents GNU Make 4.1 or older from emitting
+ * "include/generated/auto.conf: No such file or directory"
+ * in the top-level Makefile
+ *
+ * syncconfig always creates or updates auto.conf because it is
+ * used during the build.
+ */
+ if (conf_write_autoconf(sync_kconfig) && sync_kconfig) {
+ fprintf(stderr,
+ "\n*** Error during sync of the configuration.\n\n");
return 1;
}
}
fprintf(fp, "%s%s=%s\n", CONFIG_, sym->name, value);
}
-static void
-kconfig_print_cmake_symbol(FILE *fp, struct symbol *sym, const char *value, void *arg)
-{
-
- switch (sym->type) {
- case S_BOOLEAN:
- case S_TRISTATE:
- if (*value == 'n') {
- bool skip_unset = (arg != NULL);
-
- if (!skip_unset)
- fprintf(fp, "set(%s%s false)\n",
- CONFIG_, sym->name, value);
- return;
- } else if (*value == 'm') {
- abort();
- } else {
- fprintf(fp, "set(%s%s true)\n", CONFIG_, sym->name, value);
- }
- break;
- case S_HEX: {
- const char *prefix = "";
-
- if (value[0] != '0' || (value[1] != 'x' && value[1] != 'X'))
- prefix = "0x";
- fprintf(fp, "set(%s%s %s%s)\n",
- CONFIG_, sym->name, prefix, value);
- break;
- }
- case S_STRING:
- case S_INT:
- fprintf(fp, "set(%s%s %s)\n",
- CONFIG_, sym->name, value);
- break;
- default:
- break;
- }
-
-}
-
static void
kconfig_print_comment(FILE *fp, const char *value, void *arg)
{
.print_comment = kconfig_print_comment,
};
-static struct conf_printer kconfig_printer_cmake_cb =
-{
- .print_symbol = kconfig_print_cmake_symbol,
- .print_comment = kconfig_print_comment,
-};
-
/*
* Header printer
*
return 0;
}
-int conf_write_autoconf(void)
+int conf_write_autoconf(int overwrite)
{
struct symbol *sym;
const char *name;
- FILE *out, *tristate, *out_h, *out_c;
+ const char *autoconf_name = conf_get_autoconfig_name();
+ FILE *out, *tristate, *out_h;
int i;
+ if (!overwrite && is_present(autoconf_name))
+ return 0;
+
sym_clear_all_valid();
conf_write_dep("include/generated/auto.conf.cmd");
return 1;
}
- out_c = fopen(".tmpconfig.cmake", "w");
- if (!out_c) {
- fclose(out);
- fclose(tristate);
- fclose(out_h);
- }
-
conf_write_heading(out, &kconfig_printer_cb, NULL);
conf_write_heading(tristate, &tristate_printer_cb, NULL);
conf_write_heading(out_h, &header_printer_cb, NULL);
- conf_write_heading(out_c, &kconfig_printer_cmake_cb, NULL);
-
for_all_symbols(i, sym) {
sym_calc_value(sym);
if (!(sym->flags & SYMBOL_WRITE) || !sym->name)
conf_write_symbol(tristate, sym, &tristate_printer_cb, (void *)1);
conf_write_symbol(out_h, sym, &header_printer_cb, NULL);
-
- conf_write_symbol(out_c, sym, &kconfig_printer_cmake_cb, NULL);
}
fclose(out);
fclose(tristate);
fclose(out_h);
- fclose(out_c);
name = getenv("KCONFIG_AUTOHEADER");
if (!name)
if (rename(".tmpconfig_tristate", name))
return 1;
- name = getenv("KCONFIG_CMAKE");
- if (!name)
- name = "config.cmake";
- if (make_parent_dir(name))
+ if (make_parent_dir(autoconf_name))
return 1;
- if (rename(".tmpconfig.cmake", name))
- return 1;
-
- name = conf_get_autoconfig_name();
- if (make_parent_dir(name))
- return 1;
-
/*
* This must be the last step, kbuild has a dependency on auto.conf
* and this marks the successful completion of the previous steps.
*/
- if (rename(".tmpconfig", name))
+ if (rename(".tmpconfig", autoconf_name))
return 1;
return 0;
projects / carl9170fw.git / commitdiff