Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/68914 )
Change subject: util/kconfig: Uprev to Linux 5.19's kconfig ......................................................................
util/kconfig: Uprev to Linux 5.19's kconfig
Only minor changes in kconfig this time that shouldn't affect us.
TEST=`util/abuild/abuild -C` output (build.h and build.conf) remains the same
Change-Id: Icc83c929dd1ea2d98e1a789560ce26886ded1f12 Signed-off-by: Patrick Georgi patrick@coreboot.org Reviewed-on: https://review.coreboot.org/c/coreboot/+/68914 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Elyes Haouas ehaouas@noos.fr --- M util/kconfig/gconf-cfg.sh M util/kconfig/mconf-cfg.sh M util/kconfig/nconf-cfg.sh M util/kconfig/nconf.c M util/kconfig/qconf-cfg.sh 5 files changed, 54 insertions(+), 31 deletions(-)
Approvals: build bot (Jenkins): Verified Elyes Haouas: Looks good to me, approved
diff --git a/util/kconfig/gconf-cfg.sh b/util/kconfig/gconf-cfg.sh index 480ecd8..cbd90c2 100755 --- a/util/kconfig/gconf-cfg.sh +++ b/util/kconfig/gconf-cfg.sh @@ -3,14 +3,14 @@
PKG="gtk+-2.0 gmodule-2.0 libglade-2.0"
-if [ -z "$(command -v pkg-config)" ]; then +if [ -z "$(command -v ${HOSTPKG_CONFIG})" ]; then echo >&2 "*" - echo >&2 "* 'make gconfig' requires 'pkg-config'. Please install it." + echo >&2 "* 'make gconfig' requires '${HOSTPKG_CONFIG}'. Please install it." echo >&2 "*" exit 1 fi
-if ! pkg-config --exists $PKG; then +if ! ${HOSTPKG_CONFIG} --exists $PKG; then echo >&2 "*" echo >&2 "* Unable to find the GTK+ installation. Please make sure that" echo >&2 "* the GTK+ 2.0 development package is correctly installed." @@ -19,12 +19,12 @@ exit 1 fi
-if ! pkg-config --atleast-version=2.0.0 gtk+-2.0; then +if ! ${HOSTPKG_CONFIG} --atleast-version=2.0.0 gtk+-2.0; then echo >&2 "*" echo >&2 "* GTK+ is present but version >= 2.0.0 is required." echo >&2 "*" exit 1 fi
-echo cflags="$(pkg-config --cflags $PKG)" -echo libs="$(pkg-config --libs $PKG)" +echo cflags="$(${HOSTPKG_CONFIG} --cflags $PKG)" +echo libs="$(${HOSTPKG_CONFIG} --libs $PKG)" diff --git a/util/kconfig/mconf-cfg.sh b/util/kconfig/mconf-cfg.sh index 2047e62..7351bf5 100755 --- a/util/kconfig/mconf-cfg.sh +++ b/util/kconfig/mconf-cfg.sh @@ -4,16 +4,16 @@ PKG="ncursesw" PKG2="ncurses"
-if [ -n "$(command -v pkg-config)" ]; then - if pkg-config --exists $PKG; then - echo cflags="$(pkg-config --cflags $PKG)" - echo libs="$(pkg-config --libs $PKG)" +if [ -n "$(command -v ${HOSTPKG_CONFIG})" ]; then + if ${HOSTPKG_CONFIG} --exists $PKG; then + echo cflags="$(${HOSTPKG_CONFIG} --cflags $PKG)" + echo libs="$(${HOSTPKG_CONFIG} --libs $PKG)" exit 0 fi
- if pkg-config --exists $PKG2; then - echo cflags="$(pkg-config --cflags $PKG2)" - echo libs="$(pkg-config --libs $PKG2)" + if ${HOSTPKG_CONFIG} --exists $PKG2; then + echo cflags="$(${HOSTPKG_CONFIG} --cflags $PKG2)" + echo libs="$(${HOSTPKG_CONFIG} --libs $PKG2)" exit 0 fi fi @@ -52,7 +52,7 @@ echo >&2 "* Install ncurses (ncurses-devel or libncurses-dev" echo >&2 "* depending on your distribution)." echo >&2 "*" -echo >&2 "* You may also need to install pkg-config to find the" +echo >&2 "* You may also need to install ${HOSTPKG_CONFIG} to find the" echo >&2 "* ncurses installed in a non-default location." echo >&2 "*" exit 1 diff --git a/util/kconfig/nconf-cfg.sh b/util/kconfig/nconf-cfg.sh index c212255..3a10bac 100755 --- a/util/kconfig/nconf-cfg.sh +++ b/util/kconfig/nconf-cfg.sh @@ -4,16 +4,16 @@ PKG="ncursesw menuw panelw" PKG2="ncurses menu panel"
-if [ -n "$(command -v pkg-config)" ]; then - if pkg-config --exists $PKG; then - echo cflags="$(pkg-config --cflags $PKG)" - echo libs="$(pkg-config --libs $PKG)" +if [ -n "$(command -v ${HOSTPKG_CONFIG})" ]; then + if ${HOSTPKG_CONFIG} --exists $PKG; then + echo cflags="$(${HOSTPKG_CONFIG} --cflags $PKG)" + echo libs="$(${HOSTPKG_CONFIG} --libs $PKG)" exit 0 fi
- if pkg-config --exists $PKG2; then - echo cflags="$(pkg-config --cflags $PKG2)" - echo libs="$(pkg-config --libs $PKG2)" + if ${HOSTPKG_CONFIG} --exists $PKG2; then + echo cflags="$(${HOSTPKG_CONFIG} --cflags $PKG2)" + echo libs="$(${HOSTPKG_CONFIG} --libs $PKG2)" exit 0 fi fi @@ -44,7 +44,7 @@ echo >&2 "* Install ncurses (ncurses-devel or libncurses-dev" echo >&2 "* depending on your distribution)." echo >&2 "*" -echo >&2 "* You may also need to install pkg-config to find the" +echo >&2 "* You may also need to install ${HOSTPKG_CONFIG} to find the" echo >&2 "* ncurses installed in a non-default location." echo >&2 "*" exit 1 diff --git a/util/kconfig/nconf.c b/util/kconfig/nconf.c index 20ddf99..d3afdbe 100644 --- a/util/kconfig/nconf.c +++ b/util/kconfig/nconf.c @@ -54,8 +54,8 @@ "\n" "Menu navigation keys\n" "----------------------------------------------------------------------\n" -"Linewise up <Up>\n" -"Linewise down <Down>\n" +"Linewise up <Up> <k>\n" +"Linewise down <Down> <j>\n" "Pagewise up <Page Up>\n" "Pagewise down <Page Down>\n" "First entry <Home>\n" @@ -1118,9 +1118,11 @@ break; switch (res) { case KEY_DOWN: + case 'j': menu_driver(curses_menu, REQ_DOWN_ITEM); break; case KEY_UP: + case 'k': menu_driver(curses_menu, REQ_UP_ITEM); break; case KEY_NPAGE: @@ -1300,9 +1302,11 @@ break; switch (res) { case KEY_DOWN: + case 'j': menu_driver(curses_menu, REQ_DOWN_ITEM); break; case KEY_UP: + case 'k': menu_driver(curses_menu, REQ_UP_ITEM); break; case KEY_NPAGE: diff --git a/util/kconfig/qconf-cfg.sh b/util/kconfig/qconf-cfg.sh index fa564cd..9b695e5 100755 --- a/util/kconfig/qconf-cfg.sh +++ b/util/kconfig/qconf-cfg.sh @@ -3,22 +3,22 @@
PKG="Qt5Core Qt5Gui Qt5Widgets"
-if [ -z "$(command -v pkg-config)" ]; then +if [ -z "$(command -v ${HOSTPKG_CONFIG})" ]; then echo >&2 "*" - echo >&2 "* 'make xconfig' requires 'pkg-config'. Please install it." + echo >&2 "* 'make xconfig' requires '${HOSTPKG_CONFIG}'. Please install it." echo >&2 "*" exit 1 fi
-if pkg-config --exists $PKG; then - echo cflags="-std=c++11 -fPIC $(pkg-config --cflags $PKG)" - echo libs="$(pkg-config --libs $PKG)" - echo moc="$(pkg-config --variable=host_bins Qt5Core)/moc" +if ${HOSTPKG_CONFIG} --exists $PKG; then + echo cflags="-std=c++11 -fPIC $(${HOSTPKG_CONFIG} --cflags $PKG)" + echo libs="$(${HOSTPKG_CONFIG} --libs $PKG)" + echo moc="$(${HOSTPKG_CONFIG} --variable=host_bins Qt5Core)/moc" exit 0 fi
echo >&2 "*" -echo >&2 "* Could not find Qt5 via pkg-config." +echo >&2 "* Could not find Qt5 via ${HOSTPKG_CONFIG}." echo >&2 "* Please install Qt5 and make sure it's in PKG_CONFIG_PATH" echo >&2 "*" exit 1