From 94d6ec3730ac57fa2c27d1b04124d55cd5f88952 Mon Sep 17 00:00:00 2001 From: Naveen Saini Date: Mon, 15 Aug 2022 10:28:05 +0800 Subject: linux-intel-dev: update to 5.19.0 Also bring in the latest kernel config data. Signed-off-by: Naveen Saini Signed-off-by: Anuj Mittal --- recipes-kernel/linux/linux-intel-dev.bb | 8 ++-- ...mconf-cfg-Allow-specification-of-ncurses-.patch | 50 ++++++++++++++++++++++ 2 files changed, 54 insertions(+), 4 deletions(-) create mode 100644 recipes-kernel/linux/linux-intel/0001-v5.19-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch diff --git a/recipes-kernel/linux/linux-intel-dev.bb b/recipes-kernel/linux/linux-intel-dev.bb index b8256fcc..73765a8e 100644 --- a/recipes-kernel/linux/linux-intel-dev.bb +++ b/recipes-kernel/linux/linux-intel-dev.bb @@ -6,7 +6,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/linux-intel:" SRC_URI = " \ git://github.com/intel/mainline-tracking.git;protocol=https;name=machine;nobranch=1; \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=${KMETA_BRANCH};destsuffix=${KMETA} \ - file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch \ + file://0001-v5.19-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch \ " KMETA = "kernel-meta" @@ -18,9 +18,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" DEPENDS += "elfutils-native openssl-native util-linux-native" -LINUX_VERSION ?= "5.12.0" -SRCREV_machine ?= "9f4ad9e425a1d3b6a34617b8ea226d56a119a717" -SRCREV_meta ?= "99570241ac88d6c7e32b6fccd83afce53816b275" +LINUX_VERSION ?= "5.19.0" +SRCREV_machine ?= "270ddbd02fe9e1761ebccf792acadbb3cd52b69f" +SRCREV_meta ?= "423df1333e1e2a0c2bff9b29d40d16d74b775a79" LINUX_VERSION_EXTENSION ?= "-mainline-tracking-${LINUX_KERNEL_TYPE}" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/recipes-kernel/linux/linux-intel/0001-v5.19-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch b/recipes-kernel/linux/linux-intel/0001-v5.19-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch new file mode 100644 index 00000000..0ebbb008 --- /dev/null +++ b/recipes-kernel/linux/linux-intel/0001-v5.19-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch @@ -0,0 +1,50 @@ +From ecb938c19d20543382c9bbc42588c29b5ebfd3ed Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield +Date: Fri, 12 Aug 2022 13:12:18 +0800 +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 +cc: Michal Marek +cc: linux-kbuild@vger.kernel.org +Signed-off-by: Bruce Ashfield +Signed-off-by: Naveen Saini +--- + scripts/kconfig/mconf-cfg.sh | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/scripts/kconfig/mconf-cfg.sh b/scripts/kconfig/mconf-cfg.sh +index 025b565e0b7c..6514d19790e6 100755 +--- a/scripts/kconfig/mconf-cfg.sh ++++ b/scripts/kconfig/mconf-cfg.sh +@@ -4,6 +4,15 @@ + 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 ${HOSTPKG_CONFIG} --exists $PKG; then + echo cflags=\"$(${HOSTPKG_CONFIG} --cflags $PKG)\" +-- +2.25.1 + -- cgit v1.2.3-54-g00ecf