diff options
author | Naveen Saini <naveen.kumar.saini@intel.com> | 2024-01-17 16:30:39 +0800 |
---|---|---|
committer | Anuj Mittal <anuj.mittal@intel.com> | 2024-01-22 11:57:57 +0800 |
commit | 0bcaf75ea870a73eb1227afcfceac84f6d6bd15c (patch) | |
tree | d8831b645d453bdf791ba0bacd69510e1372392a /recipes-kernel/linux | |
parent | 2d8d97f295df21e1654e77b7c396ca6522392f39 (diff) | |
download | meta-intel-0bcaf75ea870a73eb1227afcfceac84f6d6bd15c.tar.gz |
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>
Diffstat (limited to 'recipes-kernel/linux')
3 files changed, 52 insertions, 11 deletions
diff --git a/recipes-kernel/linux/linux-intel.inc b/recipes-kernel/linux/linux-intel.inc index 7f81fc18..8f726627 100644 --- a/recipes-kernel/linux/linux-intel.inc +++ b/recipes-kernel/linux/linux-intel.inc | |||
@@ -11,6 +11,7 @@ SRC_URI = " \ | |||
11 | file://0001-lib-build_OID_registry-fix-reproducibility-issues.patch \ | 11 | file://0001-lib-build_OID_registry-fix-reproducibility-issues.patch \ |
12 | file://fix-perf-reproducibility.patch \ | 12 | file://fix-perf-reproducibility.patch \ |
13 | file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch \ | 13 | file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch \ |
14 | file://0002-mconf-fix-output-of-cflags-and-libraries.patch \ | ||
14 | " | 15 | " |
15 | 16 | ||
16 | PV = "${LINUX_VERSION}+git${SRCPV}" | 17 | PV = "${LINUX_VERSION}+git${SRCPV}" |
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 @@ | |||
1 | From ecb938c19d20543382c9bbc42588c29b5ebfd3ed Mon Sep 17 00:00:00 2001 | 1 | From 1811da09f42ca5e82282970e8ad014707bc94c82 Mon Sep 17 00:00:00 2001 |
2 | From: Bruce Ashfield <bruce.ashfield@windriver.com> | 2 | From: Bruce Ashfield <bruce.ashfield@windriver.com> |
3 | Date: Fri, 12 Aug 2022 13:12:18 +0800 | 3 | Date: Mon, 2 Jul 2018 23:10:28 -0400 |
4 | Subject: [PATCH] menuconfig,mconf-cfg: Allow specification of ncurses location | 4 | Subject: [PATCH 1/2] menuconfig,mconf-cfg: Allow specification of ncurses |
5 | location | ||
5 | 6 | ||
6 | In some cross build environments such as the Yocto Project build | 7 | In some cross build environments such as the Yocto Project build |
7 | environment it provides an ncurses library that is compiled | 8 | environment it provides an ncurses library that is compiled |
@@ -24,29 +25,28 @@ cc: linux-kbuild@vger.kernel.org | |||
24 | Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> | 25 | Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> |
25 | Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> | 26 | Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> |
26 | --- | 27 | --- |
27 | scripts/kconfig/mconf-cfg.sh | 9 +++++++++ | 28 | scripts/kconfig/mconf-cfg.sh | 8 ++++++++ |
28 | 1 file changed, 9 insertions(+) | 29 | 1 file changed, 8 insertions(+) |
29 | 30 | ||
30 | diff --git a/scripts/kconfig/mconf-cfg.sh b/scripts/kconfig/mconf-cfg.sh | 31 | diff --git a/scripts/kconfig/mconf-cfg.sh b/scripts/kconfig/mconf-cfg.sh |
31 | index 025b565e0b7c..6514d19790e6 100755 | 32 | index 1e61f50a5905..38cf8304bb31 100755 |
32 | --- a/scripts/kconfig/mconf-cfg.sh | 33 | --- a/scripts/kconfig/mconf-cfg.sh |
33 | +++ b/scripts/kconfig/mconf-cfg.sh | 34 | +++ b/scripts/kconfig/mconf-cfg.sh |
34 | @@ -4,6 +4,15 @@ | 35 | @@ -7,6 +7,14 @@ libs=$2 |
35 | PKG="ncursesw" | 36 | PKG="ncursesw" |
36 | PKG2="ncurses" | 37 | PKG2="ncurses" |
37 | 38 | ||
38 | +if [ "$CROSS_CURSES_LIB" != "" ]; then | 39 | +if [ "$CROSS_CURSES_LIB" != "" ]; then |
39 | + echo libs=\'$CROSS_CURSES_LIB\' | 40 | + echo libs=\'$CROSS_CURSES_LIB\' |
40 | + if [ x"$CROSS_CURSES_INC" != x ]; then | 41 | + if [ x"$CROSS_CURSES_INC" != x ]; then |
41 | + echo cflags=\'$CROSS_CURSES_INC\' | 42 | + echo cflags=\'$CROSS_CURSES_INC\' |
42 | + fi | 43 | + fi |
43 | + exit 0 | 44 | + exit 0 |
44 | +fi | 45 | +fi |
45 | + | 46 | + |
46 | + | ||
47 | if [ -n "$(command -v ${HOSTPKG_CONFIG})" ]; then | 47 | if [ -n "$(command -v ${HOSTPKG_CONFIG})" ]; then |
48 | if ${HOSTPKG_CONFIG} --exists $PKG; then | 48 | if ${HOSTPKG_CONFIG} --exists $PKG; then |
49 | echo cflags=\"$(${HOSTPKG_CONFIG} --cflags $PKG)\" | 49 | ${HOSTPKG_CONFIG} --cflags ${PKG} > ${cflags} |
50 | -- | 50 | -- |
51 | 2.25.1 | 51 | 2.34.1 |
52 | 52 | ||
diff --git a/recipes-kernel/linux/linux-intel/0002-mconf-fix-output-of-cflags-and-libraries.patch b/recipes-kernel/linux/linux-intel/0002-mconf-fix-output-of-cflags-and-libraries.patch new file mode 100644 index 00000000..a96b68d9 --- /dev/null +++ b/recipes-kernel/linux/linux-intel/0002-mconf-fix-output-of-cflags-and-libraries.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | From 1b53d82a8152843afcddd7f16b0c43b6b4f22895 Mon Sep 17 00:00:00 2001 | ||
2 | From: Bruce Ashfield <bruce.ashfield@gmail.com> | ||
3 | Date: Mon, 17 Jul 2023 17:17:55 -0400 | ||
4 | Subject: [PATCH 2/2] mconf: fix output of cflags and libraries | ||
5 | |||
6 | commit 3122c84409d578a5df8bcb1 [kconfig: refactor Makefile to reduce | ||
7 | process forks] changes the way that flags are detected. They are | ||
8 | no longer just echo'd and captured, they are written to a file and | ||
9 | later read. | ||
10 | |||
11 | We adjust our CROSS ncurses patch accordingly. | ||
12 | |||
13 | We'll eventually be able to drop this patch, but not quite yet. | ||
14 | |||
15 | Upstream-Status: Inappropriate [OE-Specific] | ||
16 | Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> | ||
17 | Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> | ||
18 | --- | ||
19 | scripts/kconfig/mconf-cfg.sh | 4 ++-- | ||
20 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
21 | |||
22 | diff --git a/scripts/kconfig/mconf-cfg.sh b/scripts/kconfig/mconf-cfg.sh | ||
23 | index 38cf8304bb31..a5ae56e08b07 100755 | ||
24 | --- a/scripts/kconfig/mconf-cfg.sh | ||
25 | +++ b/scripts/kconfig/mconf-cfg.sh | ||
26 | @@ -8,9 +8,9 @@ PKG="ncursesw" | ||
27 | PKG2="ncurses" | ||
28 | |||
29 | if [ "$CROSS_CURSES_LIB" != "" ]; then | ||
30 | - echo libs=\'$CROSS_CURSES_LIB\' | ||
31 | + echo $CROSS_CURSES_LIB > ${libs} | ||
32 | if [ x"$CROSS_CURSES_INC" != x ]; then | ||
33 | - echo cflags=\'$CROSS_CURSES_INC\' | ||
34 | + echo $CROSS_CURSES_INC > ${cflags} | ||
35 | fi | ||
36 | exit 0 | ||
37 | fi | ||
38 | -- | ||
39 | 2.34.1 | ||
40 | |||