linux-intel/5.15: update to tag lts-v5.15.94-linux-230320T134421Z

* Update kernel cache.
* Refresh patch because mconf-cfg.sh is updated to use HOSTPKG_CONFIG
  parameter to override pkg-config parameter.

Signed-off-by: Teoh Suh Haw <suh.haw.teoh@intel.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>

3 files changed, 58 insertions, 4 deletions

diff --git a/recipes-kernel/linux/linux-intel.inc b/recipes-kernel/linux/linux-intel.inc
index b1ee9355..3656b9ed 100644
--- a/recipes-kernel/linux/linux-intel.inc
+++ b/recipes-kernel/linux/linux-intel.inc
@@ -8,7 +8,6 @@ KERNEL_CONFIG_URI ?= "git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;n
 SRC_URI = " \
            git://github.com/intel/linux-intel-lts.git;protocol=https;name=machine;branch=${KBRANCH}; \
            ${KERNEL_CONFIG_URI} \
-           file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch \
            file://0001-vt-conmakehash-improve-reproducibility.patch \
            file://0001-lib-build_OID_registry-fix-reproducibility-issues.patch \
           "
diff --git a/recipes-kernel/linux/linux-intel/0001-v5.15-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch b/recipes-kernel/linux/linux-intel/0001-v5.15-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch
new file mode 100644
index 00000000..1ff8e126
--- /dev/null
+++ b/recipes-kernel/linux/linux-intel/0001-v5.15-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch
@@ -0,0 +1,53 @@
+From bebd63730a433ba62549a80114a9851328aa8897 Mon Sep 17 00:00:00 2001
+From: Bruce Ashfield <bruce.ashfield@windriver.com>
+Date: Mon, 2 Jul 2018 23:10:28 -0400
+Subject: [PATCH] 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
+differently than the host's version.  This causes display corruption
+problems when the host's curses includes are used instead of the
+includes from the provided compiler are overridden.  There is a second
+case where there is no curses libraries at all on the host system and
+menuconfig will just fail entirely.
+
+The solution is simply to allow an override variable in
+check-lxdialog.sh for environments such as the Yocto Project.  Adding
+a CROSS_CURSES_LIB and CROSS_CURSES_INC solves the issue and allowing
+compiling and linking against the right headers and libraries.
+
+Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
+cc: Michal Marek <mmarek@suse.cz>
+cc: linux-kbuild@vger.kernel.org
+Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
+
+Upstream-Status: Submitted
+
+Taken from 0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch
+Change pkg-config parameter to HOSTPKG_CONFIG parameter
+Signed-off-by: Teoh Suh Haw <suh.haw.teoh@intel.com>
+---
+ 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 c812872d7f9d..42d20819025c 100755
+--- a/scripts/kconfig/mconf-cfg.sh
++++ b/scripts/kconfig/mconf-cfg.sh
+@@ -4,6 +4,14 @@
+ 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\'
++       fi
++       exit 0
++fi
++
+ if [ -n "$(command -v ${HOSTPKG_CONFIG})" ]; then
+        if pkg-config --exists $PKG; then
+                echo cflags=\"$(pkg-config --cflags $PKG)\"
+-- 
+2.17.1
diff --git a/recipes-kernel/linux/linux-intel_5.15.bb b/recipes-kernel/linux/linux-intel_5.15.bb
index a8a58109..ca9c00b0 100644
--- a/recipes-kernel/linux/linux-intel_5.15.bb
+++ b/recipes-kernel/linux/linux-intel_5.15.bb
@@ -4,12 +4,14 @@ KBRANCH = "5.15/linux"
 KMETA_BRANCH = "yocto-5.15"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
+SRC_URI:append = " file://0001-v5.15-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch \
+                   "
 
 DEPENDS += "elfutils-native openssl-native util-linux-native"
 
-LINUX_VERSION ?= "5.15.85"
-SRCREV_machine ?= "c256f934aefa78ec001067313a76a4a382ac59a6"
-SRCREV_meta ?= "78c4410c172946903e35ba8cebf1cf90fad09b5a"
+LINUX_VERSION ?= "5.15.94"
+SRCREV_machine ?= "3923d78d0a7feaf6346d4e42d52f59310f0c7e3f"
+SRCREV_meta ?= "7d9ad29bc707e1eb341d95961941b2042f49e2b2"
 
 # For Crystalforest and Romley
 KERNEL_MODULE_AUTOLOAD:append:core2-32-intel-common = " uio"