linux-intel: fix menuconfig

Refreshed and include patches from linux-yocto 6.6 to detect ncurses correctly when
cross-compiling.

Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>

1 files changed, 11 insertions, 11 deletions

diff --git a/recipes-kernel/linux/linux-intel/0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch b/recipes-kernel/linux/linux-intel/0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch
index 9aff37de..a601e783 100644
--- a/recipes-kernel/linux/linux-intel/0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch
+++ b/recipes-kernel/linux/linux-intel/0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch
@@ -1,7 +1,8 @@
-From ecb938c19d20543382c9bbc42588c29b5ebfd3ed Mon Sep 17 00:00:00 2001
+From 1811da09f42ca5e82282970e8ad014707bc94c82 Mon Sep 17 00:00:00 2001
 From: Bruce Ashfield <bruce.ashfield@windriver.com>
-Date: Fri, 12 Aug 2022 13:12:18 +0800
-Subject: [PATCH] menuconfig,mconf-cfg: Allow specification of ncurses location
+Date: Mon, 2 Jul 2018 23:10:28 -0400
+Subject: [PATCH 1/2] menuconfig,mconf-cfg: Allow specification of ncurses
+ location
 
 In some cross build environments such as the Yocto Project build
 environment it provides an ncurses library that is compiled
@@ -24,29 +25,28 @@ cc: linux-kbuild@vger.kernel.org
 Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
 Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
 ---
- scripts/kconfig/mconf-cfg.sh | 9 +++++++++
- 1 file changed, 9 insertions(+)
+ scripts/kconfig/mconf-cfg.sh | 8 ++++++++
+ 1 file changed, 8 insertions(+)
 
 diff --git a/scripts/kconfig/mconf-cfg.sh b/scripts/kconfig/mconf-cfg.sh
-index 025b565e0b7c..6514d19790e6 100755
+index 1e61f50a5905..38cf8304bb31 100755
 --- a/scripts/kconfig/mconf-cfg.sh
 +++ b/scripts/kconfig/mconf-cfg.sh
-@@ -4,6 +4,15 @@
+@@ -7,6 +7,14 @@ libs=$2
  PKG="ncursesw"
  PKG2="ncurses"
  
 +if [ "$CROSS_CURSES_LIB" != "" ]; then
 +    echo libs=\'$CROSS_CURSES_LIB\'
 +    if [ x"$CROSS_CURSES_INC" != x ]; then
-+        echo cflags=\'$CROSS_CURSES_INC\'
++       echo cflags=\'$CROSS_CURSES_INC\'
 +    fi
 +    exit 0
 +fi
 +
-+
  if [ -n "$(command -v ${HOSTPKG_CONFIG})" ]; then
         if ${HOSTPKG_CONFIG} --exists $PKG; then
-                echo cflags=\"$(${HOSTPKG_CONFIG} --cflags $PKG)\"
+                ${HOSTPKG_CONFIG} --cflags ${PKG} > ${cflags}
 -- 
-2.25.1
+2.34.1