diff options
| -rw-r--r-- | util/kconfig/confdata.c | 5 | ||||
| -rw-r--r-- | util/kconfig/patches/0014-util-kconfig-Move-Kconfig-deps-back-into-build-confi.patch | 7 |
2 files changed, 11 insertions, 1 deletions
diff --git a/util/kconfig/confdata.c b/util/kconfig/confdata.c index 3da9e8b38d..1300ab674f 100644 --- a/util/kconfig/confdata.c +++ b/util/kconfig/confdata.c @@ -1035,6 +1035,11 @@ static int conf_touch_deps(void) struct symbol *sym; int res, i; + /* + * Upstream Kconfig sets depfile_path based on the directory + * prefix of the autoconfig path, but coreboot overrides this + * using the KCONFIG_SPLITCONFIG environment variable + */ strcpy(depfile_path, conf_get_autobase_name()); depfile_prefix_len = strlen(depfile_path); diff --git a/util/kconfig/patches/0014-util-kconfig-Move-Kconfig-deps-back-into-build-confi.patch b/util/kconfig/patches/0014-util-kconfig-Move-Kconfig-deps-back-into-build-confi.patch index b4db86ea5b..869adefc40 100644 --- a/util/kconfig/patches/0014-util-kconfig-Move-Kconfig-deps-back-into-build-confi.patch +++ b/util/kconfig/patches/0014-util-kconfig-Move-Kconfig-deps-back-into-build-confi.patch @@ -35,7 +35,7 @@ Index: kconfig/confdata.c static int conf_set_sym_val(struct symbol *sym, int def, int def_flags, char *p) { char *p2; -@@ -1024,19 +1031,14 @@ static int conf_write_autoconf_cmd(const +@@ -1024,19 +1031,19 @@ static int conf_write_autoconf_cmd(const static int conf_touch_deps(void) { @@ -52,6 +52,11 @@ Index: kconfig/confdata.c - - strncpy(depfile_path, name, depfile_prefix_len); - depfile_path[depfile_prefix_len] = 0; ++ /* ++ * Upstream Kconfig sets depfile_path based on the directory ++ * prefix of the autoconfig path, but coreboot overrides this ++ * using the KCONFIG_SPLITCONFIG environment variable ++ */ + strcpy(depfile_path, conf_get_autobase_name()); + depfile_prefix_len = strlen(depfile_path); |