diff options
| author | Jing Leng <jleng@ambarella.com> | 2022-02-11 10:27:36 +0100 |
|---|---|---|
| committer | Masahiro Yamada <masahiroy@kernel.org> | 2022-02-12 15:24:19 +0100 |
| commit | 1b9e740a81f91ae338b29ed70455719804957b80 (patch) | |
| tree | edafdf4a7fbb6c38e93e8df90fc8f2343856dbbd | |
| parent | kconfig: fix missing fclose() on error paths (diff) | |
| download | linux-1b9e740a81f91ae338b29ed70455719804957b80.tar.xz linux-1b9e740a81f91ae338b29ed70455719804957b80.zip | |
kconfig: fix failing to generate auto.conf
When the KCONFIG_AUTOCONFIG is specified (e.g. export \
KCONFIG_AUTOCONFIG=output/config/auto.conf), the directory of
include/config/ will not be created, so kconfig can't create deps
files in it and auto.conf can't be generated.
Signed-off-by: Jing Leng <jleng@ambarella.com>
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
| -rw-r--r-- | scripts/kconfig/confdata.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c index 16897cb8cefd..d3c3a61308ad 100644 --- a/scripts/kconfig/confdata.c +++ b/scripts/kconfig/confdata.c @@ -994,14 +994,19 @@ static int conf_write_autoconf_cmd(const char *autoconf_name) static int conf_touch_deps(void) { - const char *name; + const char *name, *tmp; struct symbol *sym; int res, i; - strcpy(depfile_path, "include/config/"); - depfile_prefix_len = strlen(depfile_path); - name = conf_get_autoconfig_name(); + tmp = strrchr(name, '/'); + depfile_prefix_len = tmp ? tmp - name + 1 : 0; + if (depfile_prefix_len + 1 > sizeof(depfile_path)) + return -1; + + strncpy(depfile_path, name, depfile_prefix_len); + depfile_path[depfile_prefix_len] = 0; + conf_read_simple(name, S_DEF_AUTO); sym_calc_value(modules_sym); |