diff options
-rw-r--r-- | recipes-kernel/linux/linux-intel-dev.bb | 10 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-intel/0001-v5.19-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch | 50 |
2 files changed, 55 insertions, 5 deletions
diff --git a/recipes-kernel/linux/linux-intel-dev.bb b/recipes-kernel/linux/linux-intel-dev.bb index 4da6e3b9..12dda6cb 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:" | |||
6 | SRC_URI = " \ | 6 | SRC_URI = " \ |
7 | git://github.com/intel/mainline-tracking.git;protocol=https;name=machine;nobranch=1; \ | 7 | git://github.com/intel/mainline-tracking.git;protocol=https;name=machine;nobranch=1; \ |
8 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=${KMETA_BRANCH};destsuffix=${KMETA} \ | 8 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=${KMETA_BRANCH};destsuffix=${KMETA} \ |
9 | file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch \ | 9 | file://0001-v5.19-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch \ |
10 | " | 10 | " |
11 | SRC_URI_append_core2-32-intel-common = " file://disable_skylake_sound.cfg" | 11 | SRC_URI_append_core2-32-intel-common = " file://disable_skylake_sound.cfg" |
12 | 12 | ||
@@ -15,13 +15,13 @@ KCONF_BSP_AUDIT_LEVEL = "2" | |||
15 | 15 | ||
16 | KMETA_BRANCH = "master" | 16 | KMETA_BRANCH = "master" |
17 | 17 | ||
18 | LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" | 18 | LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" |
19 | 19 | ||
20 | DEPENDS += "elfutils-native openssl-native util-linux-native" | 20 | DEPENDS += "elfutils-native openssl-native util-linux-native" |
21 | 21 | ||
22 | LINUX_VERSION ?= "5.5-rc3" | 22 | LINUX_VERSION ?= "5.19.0" |
23 | SRCREV_machine ?= "0c5d381c6f1ebd88b4da2c3392f86d1611daba84" | 23 | SRCREV_machine ?= "270ddbd02fe9e1761ebccf792acadbb3cd52b69f" |
24 | SRCREV_meta ?= "1b65db46af4e00e257a6be18cb06736cb83d54dd" | 24 | SRCREV_meta ?= "423df1333e1e2a0c2bff9b29d40d16d74b775a79" |
25 | 25 | ||
26 | LINUX_VERSION_EXTENSION ?= "-mainline-tracking-${LINUX_KERNEL_TYPE}" | 26 | LINUX_VERSION_EXTENSION ?= "-mainline-tracking-${LINUX_KERNEL_TYPE}" |
27 | PV = "${LINUX_VERSION}+git${SRCPV}" | 27 | 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 @@ | |||
1 | From ecb938c19d20543382c9bbc42588c29b5ebfd3ed Mon Sep 17 00:00:00 2001 | ||
2 | From: Bruce Ashfield <bruce.ashfield@windriver.com> | ||
3 | Date: Fri, 12 Aug 2022 13:12:18 +0800 | ||
4 | Subject: [PATCH] menuconfig,mconf-cfg: Allow specification of ncurses location | ||
5 | |||
6 | In some cross build environments such as the Yocto Project build | ||
7 | environment it provides an ncurses library that is compiled | ||
8 | differently than the host's version. This causes display corruption | ||
9 | problems when the host's curses includes are used instead of the | ||
10 | includes from the provided compiler are overridden. There is a second | ||
11 | case where there is no curses libraries at all on the host system and | ||
12 | menuconfig will just fail entirely. | ||
13 | |||
14 | The solution is simply to allow an override variable in | ||
15 | check-lxdialog.sh for environments such as the Yocto Project. Adding | ||
16 | a CROSS_CURSES_LIB and CROSS_CURSES_INC solves the issue and allowing | ||
17 | compiling and linking against the right headers and libraries. | ||
18 | |||
19 | Signed-off-by: Jason Wessel <jason.wessel@windriver.com> | ||
20 | cc: Michal Marek <mmarek@suse.cz> | ||
21 | cc: linux-kbuild@vger.kernel.org | ||
22 | Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> | ||
23 | Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> | ||
24 | --- | ||
25 | scripts/kconfig/mconf-cfg.sh | 9 +++++++++ | ||
26 | 1 file changed, 9 insertions(+) | ||
27 | |||
28 | diff --git a/scripts/kconfig/mconf-cfg.sh b/scripts/kconfig/mconf-cfg.sh | ||
29 | index 025b565e0b7c..6514d19790e6 100755 | ||
30 | --- a/scripts/kconfig/mconf-cfg.sh | ||
31 | +++ b/scripts/kconfig/mconf-cfg.sh | ||
32 | @@ -4,6 +4,15 @@ | ||
33 | PKG="ncursesw" | ||
34 | PKG2="ncurses" | ||
35 | |||
36 | +if [ "$CROSS_CURSES_LIB" != "" ]; then | ||
37 | + echo libs=\'$CROSS_CURSES_LIB\' | ||
38 | + if [ x"$CROSS_CURSES_INC" != x ]; then | ||
39 | + echo cflags=\'$CROSS_CURSES_INC\' | ||
40 | + fi | ||
41 | + exit 0 | ||
42 | +fi | ||
43 | + | ||
44 | + | ||
45 | if [ -n "$(command -v ${HOSTPKG_CONFIG})" ]; then | ||
46 | if ${HOSTPKG_CONFIG} --exists $PKG; then | ||
47 | echo cflags=\"$(${HOSTPKG_CONFIG} --cflags $PKG)\" | ||
48 | -- | ||
49 | 2.25.1 | ||
50 | |||