X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=config%2Fconf.c;h=9cb55bfbd46061eb0f86e6982a737690366eec2e;hb=1cad5edcbe7319807b678e2c263def285f6abcd2;hp=58df1b76b5288ad46661d75cacf88ead9cf456f9;hpb=786134321b6ef391f04409de1200482e7693284d;p=carl9170fw.git diff --git a/config/conf.c b/config/conf.c index 58df1b7..9cb55bf 100644 --- a/config/conf.c +++ b/config/conf.c @@ -488,7 +488,6 @@ int main(int ac, char **av) const char *progname = av[0]; int opt; const char *name, *defconfig_file = NULL /* gcc uninit */; - struct stat tmpstat; int no_conf_write = 0; tty_stdio = isatty(0) && isatty(1); @@ -560,18 +559,6 @@ int main(int ac, char **av) 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: @@ -705,6 +692,13 @@ int main(int ac, char **av) * syncconfig always creates or updates auto.conf because it is * used during the build. */ + + /* + * In our cmake case, we always want to update the autogenerated + * files. + */ + sync_kconfig = 1; + if (conf_write_autoconf(sync_kconfig) && sync_kconfig) { fprintf(stderr, "\n*** Error during sync of the configuration.\n\n");