MIRRORS/meta-intel
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-intel.git synced 2025-07-19 12:59:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

linux-intel: fix menuconfig

Browse Source 
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>
This commit is contained in:
Naveen Saini 2024-01-17 16:30:39 +08:00 committed by Anuj Mittal
parent 2d8d97f295
commit 0bcaf75ea8
3 changed files with 52 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
recipes-kernel/linux/linux-intel.inc
View File

@ -11,6 +11,7 @@ SRC_URI = " \
file://0001-lib-build_OID_registry-fix-reproducibility-issues.patch \
file://fix-perf-reproducibility.patch \
file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch \
file://0002-mconf-fix-output-of-cflags-and-libraries.patch \
"
PV = "${LINUX_VERSION}+git${SRCPV}"

22
recipes-kernel/linux/linux-intel/0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch
View File

@ -1,7 +1,8 @@
From ecb938c19d20543382c9bbc42588c29b5ebfd3ed Mon Sep 17 00:00:00 2001
From 1811da09f42ca5e82282970e8ad014707bc94c82 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@windriver.com>
Date: Fri, 12 Aug 2022 13:12:18 +0800
Subject: [PATCH] menuconfig,mconf-cfg: Allow specification of ncurses location
Date: Mon, 2 Jul 2018 23:10:28 -0400
Subject: [PATCH 1/2] 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
@ -24,29 +25,28 @@ cc: linux-kbuild@vger.kernel.org
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
---
scripts/kconfig/mconf-cfg.sh | 9 +++++++++
1 file changed, 9 insertions(+)
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 025b565e0b7c..6514d19790e6 100755
index 1e61f50a5905..38cf8304bb31 100755
--- a/scripts/kconfig/mconf-cfg.sh
+++ b/scripts/kconfig/mconf-cfg.sh
@@ -4,6 +4,15 @@
@@ -7,6 +7,14 @@ libs=$2
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\'
+ 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)\"
${HOSTPKG_CONFIG} --cflags ${PKG} > ${cflags}
--
2.25.1
2.34.1

40
recipes-kernel/linux/linux-intel/0002-mconf-fix-output-of-cflags-and-libraries.patch Normal file
View File

@ -0,0 +1,40 @@
From 1b53d82a8152843afcddd7f16b0c43b6b4f22895 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Mon, 17 Jul 2023 17:17:55 -0400
Subject: [PATCH 2/2] mconf: fix output of cflags and libraries
commit 3122c84409d578a5df8bcb1 [kconfig: refactor Makefile to reduce
process forks] changes the way that flags are detected. They are
no longer just echo'd and captured, they are written to a file and
later read.
We adjust our CROSS ncurses patch accordingly.
We'll eventually be able to drop this patch, but not quite yet.
Upstream-Status: Inappropriate [OE-Specific]
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
---
scripts/kconfig/mconf-cfg.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/kconfig/mconf-cfg.sh b/scripts/kconfig/mconf-cfg.sh
index 38cf8304bb31..a5ae56e08b07 100755
--- a/scripts/kconfig/mconf-cfg.sh
+++ b/scripts/kconfig/mconf-cfg.sh
@@ -8,9 +8,9 @@ PKG="ncursesw"
PKG2="ncurses"
if [ "$CROSS_CURSES_LIB" != "" ]; then
- echo libs=\'$CROSS_CURSES_LIB\'
+ echo $CROSS_CURSES_LIB > ${libs}
if [ x"$CROSS_CURSES_INC" != x ]; then
- echo cflags=\'$CROSS_CURSES_INC\'
+ echo $CROSS_CURSES_INC > ${cflags}
fi
exit 0
fi
--
2.34.1