diff options
| author | Patrick Georgi <patrick@coreboot.org> | 2023-11-20 18:03:34 +0100 |
|---|---|---|
| committer | Patrick Georgi <patrick@coreboot.org> | 2023-11-24 16:50:00 +0000 |
| commit | 7eab8ef8b720e8744eea3c6c771bccc217fbe5ed (patch) | |
| tree | 77ad03dacd92b5544ffc2b66f8a37c782b83139d /util/kconfig/patches | |
| parent | 7f93aa491915b09a8d30b75d32dfa787b4d886f8 (diff) | |
util/kconfig: Uprev to Linux 6.2's kconfig
The upstream build system uses a newly introduced function `read-file`,
so copy that in from Linux 6.2.
TEST=`util/abuild/abuild -C` output (config.h and config.build) remains
the same
Change-Id: Ic100bf189ebd3eaa0eb26904ae8602910329a180
Signed-off-by: Patrick Georgi <patrick@coreboot.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/79179
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Martin L Roth <gaumless@gmail.com>
Diffstat (limited to 'util/kconfig/patches')
| -rw-r--r-- | util/kconfig/patches/0007-kconfig-Allow-KCONFIG_STRICT-outside-of-confdata.c.patch | 4 | ||||
| -rw-r--r-- | util/kconfig/patches/0013-util-kconfig-detect-ncurses-on-FreeBSD.patch | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/util/kconfig/patches/0007-kconfig-Allow-KCONFIG_STRICT-outside-of-confdata.c.patch b/util/kconfig/patches/0007-kconfig-Allow-KCONFIG_STRICT-outside-of-confdata.c.patch index 05a92d411d..a001519a33 100644 --- a/util/kconfig/patches/0007-kconfig-Allow-KCONFIG_STRICT-outside-of-confdata.c.patch +++ b/util/kconfig/patches/0007-kconfig-Allow-KCONFIG_STRICT-outside-of-confdata.c.patch @@ -102,7 +102,7 @@ Index: kconfig/mconf.c static const char mconf_readme[] = "Overview\n" "--------\n" -@@ -948,6 +950,7 @@ static void conf_save(void) +@@ -953,6 +955,7 @@ static void conf_save(void) static int handle_exit(void) { int res; @@ -110,7 +110,7 @@ Index: kconfig/mconf.c save_and_exit = 1; reset_subtitle(); -@@ -962,6 +965,13 @@ static int handle_exit(void) +@@ -967,6 +970,13 @@ static int handle_exit(void) end_dialog(saved_x, saved_y); diff --git a/util/kconfig/patches/0013-util-kconfig-detect-ncurses-on-FreeBSD.patch b/util/kconfig/patches/0013-util-kconfig-detect-ncurses-on-FreeBSD.patch index 931169d20a..f4743e1112 100644 --- a/util/kconfig/patches/0013-util-kconfig-detect-ncurses-on-FreeBSD.patch +++ b/util/kconfig/patches/0013-util-kconfig-detect-ncurses-on-FreeBSD.patch @@ -13,7 +13,7 @@ Index: kconfig/mconf-cfg.sh =================================================================== --- kconfig.orig/mconf-cfg.sh +++ kconfig/mconf-cfg.sh -@@ -33,6 +33,12 @@ if [ -f /usr/include/ncurses/ncurses.h ] +@@ -36,6 +36,12 @@ if [ -f /usr/include/ncurses/ncurses.h ] exit 0 fi |