Nicholas Chin has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/69863 )
Change subject: util/kconfig: Fix patch to be compatible with quilt ......................................................................
util/kconfig: Fix patch to be compatible with quilt
The patch added in commit b7f92a0b6a0f (util/kconfig: Add patch to move Kconfig deps to build/config) uses git diff formatting, which is incompatible with quilt.
Change-Id: I95bfe6571e3a2cc2b38074b4338f1610a4c8a595 Signed-off-by: Nicholas Chin nic.c3.14@gmail.com --- M util/kconfig/patches/0014-util-kconfig-Move-Kconfig-deps-back-into-build-confi.patch 1 file changed, 20 insertions(+), 9 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/63/69863/1
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 fb85035..b4db86e 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 @@ -17,11 +17,11 @@ util/kconfig/confdata.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-)
-diff --git a/util/kconfig/confdata.c b/util/kconfig/confdata.c -index 95fb960179..3da9e8b38d 100644 ---- a/util/kconfig/confdata.c -+++ b/util/kconfig/confdata.c -@@ -230,6 +230,13 @@ static const char *conf_get_autoheader_name(void) +Index: kconfig/confdata.c +=================================================================== +--- kconfig.orig/confdata.c ++++ kconfig/confdata.c +@@ -230,6 +230,13 @@ static const char *conf_get_autoheader_n return name ? name : "include/generated/autoconf.h"; }
@@ -35,7 +35,7 @@ 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 char *autoconf_name) +@@ -1024,19 +1031,14 @@ static int conf_write_autoconf_cmd(const
static int conf_touch_deps(void) { @@ -59,6 +59,3 @@ conf_read_simple(name, S_DEF_AUTO); sym_calc_value(modules_sym);
--- -2.30.2 -