diff options
Diffstat (limited to 'recipes-kernel/linux')
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 | |||
8 | SRC_URI = " \ | 8 | SRC_URI = " \ |
9 | git://github.com/intel/linux-intel-lts.git;protocol=https;name=machine;branch=${KBRANCH}; \ | 9 | git://github.com/intel/linux-intel-lts.git;protocol=https;name=machine;branch=${KBRANCH}; \ |
10 | ${KERNEL_CONFIG_URI} \ | 10 | ${KERNEL_CONFIG_URI} \ |
11 | file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch \ | ||
12 | file://0001-vt-conmakehash-improve-reproducibility.patch \ | 11 | file://0001-vt-conmakehash-improve-reproducibility.patch \ |
13 | file://0001-lib-build_OID_registry-fix-reproducibility-issues.patch \ | 12 | file://0001-lib-build_OID_registry-fix-reproducibility-issues.patch \ |
14 | " | 13 | " |
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 @@ | |||
1 | From bebd63730a433ba62549a80114a9851328aa8897 Mon Sep 17 00:00:00 2001 | ||
2 | From: Bruce Ashfield <bruce.ashfield@windriver.com> | ||
3 | Date: Mon, 2 Jul 2018 23:10:28 -0400 | ||
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 | |||
24 | Upstream-Status: Submitted | ||
25 | |||
26 | Taken from 0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch | ||
27 | Change pkg-config parameter to HOSTPKG_CONFIG parameter | ||
28 | Signed-off-by: Teoh Suh Haw <suh.haw.teoh@intel.com> | ||
29 | --- | ||
30 | scripts/kconfig/mconf-cfg.sh | 8 ++++++++ | ||
31 | 1 file changed, 8 insertions(+) | ||
32 | |||
33 | diff --git a/scripts/kconfig/mconf-cfg.sh b/scripts/kconfig/mconf-cfg.sh | ||
34 | index c812872d7f9d..42d20819025c 100755 | ||
35 | --- a/scripts/kconfig/mconf-cfg.sh | ||
36 | +++ b/scripts/kconfig/mconf-cfg.sh | ||
37 | @@ -4,6 +4,14 @@ | ||
38 | PKG="ncursesw" | ||
39 | PKG2="ncurses" | ||
40 | |||
41 | +if [ "$CROSS_CURSES_LIB" != "" ]; then | ||
42 | + echo libs=\'$CROSS_CURSES_LIB\' | ||
43 | + if [ x"$CROSS_CURSES_INC" != x ]; then | ||
44 | + echo cflags=\'$CROSS_CURSES_INC\' | ||
45 | + fi | ||
46 | + exit 0 | ||
47 | +fi | ||
48 | + | ||
49 | if [ -n "$(command -v ${HOSTPKG_CONFIG})" ]; then | ||
50 | if pkg-config --exists $PKG; then | ||
51 | echo cflags=\"$(pkg-config --cflags $PKG)\" | ||
52 | -- | ||
53 | 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" | |||
4 | KMETA_BRANCH = "yocto-5.15" | 4 | KMETA_BRANCH = "yocto-5.15" |
5 | 5 | ||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" |
7 | SRC_URI:append = " file://0001-v5.15-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch \ | ||
8 | " | ||
7 | 9 | ||
8 | DEPENDS += "elfutils-native openssl-native util-linux-native" | 10 | DEPENDS += "elfutils-native openssl-native util-linux-native" |
9 | 11 | ||
10 | LINUX_VERSION ?= "5.15.85" | 12 | LINUX_VERSION ?= "5.15.94" |
11 | SRCREV_machine ?= "c256f934aefa78ec001067313a76a4a382ac59a6" | 13 | SRCREV_machine ?= "3923d78d0a7feaf6346d4e42d52f59310f0c7e3f" |
12 | SRCREV_meta ?= "78c4410c172946903e35ba8cebf1cf90fad09b5a" | 14 | SRCREV_meta ?= "7d9ad29bc707e1eb341d95961941b2042f49e2b2" |
13 | 15 | ||
14 | # For Crystalforest and Romley | 16 | # For Crystalforest and Romley |
15 | KERNEL_MODULE_AUTOLOAD:append:core2-32-intel-common = " uio" | 17 | KERNEL_MODULE_AUTOLOAD:append:core2-32-intel-common = " uio" |