sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

util/kconfig: Fix patch to be compatible with quilt

Browse Source 
The patch added in commit b7f92a0b6a (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>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/69863
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Fred Reitberger <reitbergerfred@gmail.com>
Reviewed-by: Paul Menzel <paulepanter@mailbox.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Martin L Roth <gaumless@gmail.com>
This commit is contained in:
Nicholas Chin
2022-11-20 11:00:42 -07:00
committed by Martin L Roth
parent dd7a04e7d7
commit 6e902bcfcb
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
util/kconfig/patches/0014-util-kconfig-Move-Kconfig-deps-back-into-build-confi.patch
View File

@@ -17,11 +17,11 @@ Change-Id: I2904f69a5d85337ad0a6b48590ccd4b4a6e38b70
util/kconfig/confdata.c | 20 +++++++++++--------- util/kconfig/confdata.c | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-) 1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/util/kconfig/confdata.c b/util/kconfig/confdata.c Index: kconfig/confdata.c
index 95fb960179..3da9e8b38d 100644 ===================================================================
--- a/util/kconfig/confdata.c --- kconfig.orig/confdata.c
+++ b/util/kconfig/confdata.c +++ kconfig/confdata.c
@@ -230,6 +230,13 @@ static const char *conf_get_autoheader_name(void) @@ -230,6 +230,13 @@ static const char *conf_get_autoheader_n
return name ? name : "include/generated/autoconf.h"; return name ? name : "include/generated/autoconf.h";
} }
@@ -35,7 +35,7 @@ index 95fb960179..3da9e8b38d 100644
static int conf_set_sym_val(struct symbol *sym, int def, int def_flags, char *p) static int conf_set_sym_val(struct symbol *sym, int def, int def_flags, char *p)
{ {
char *p2; 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) static int conf_touch_deps(void)
{ {
@@ -59,6 +59,3 @@ index 95fb960179..3da9e8b38d 100644
conf_read_simple(name, S_DEF_AUTO); conf_read_simple(name, S_DEF_AUTO);
sym_calc_value(modules_sym); sym_calc_value(modules_sym);
--
2.30.2