mirror of
https://git.yoctoproject.org/meta-arm
synced 2026-07-16 15:57:19 +00:00
meta-arm-bsp:linux-linaro-arm: Fix kernel menuconfig task
When calling `bitbake virtual/kernel -c menuconfig` it fails if the ncurses-dev package is not installed on the host machine. This patch makes usage of the ncurses library built by yocto if it is present. Change-Id: I6a8c4ca6a7da07ac834b29a2d23e83e6c153efb3 Signed-off-by: Diego Sueiro <diego.sueiro@arm.com> Signed-off-by: Jon Mason <jon.mason@arm.com>
This commit is contained in:
+52
@@ -0,0 +1,52 @@
|
|||||||
|
rom d078e29aa31ac3fa4c041bf89c46bc6372c1a02a Mon Sep 17 00:00:00 2001
|
||||||
|
From: Bruce Ashfield <bruce.ashfield@windriver.com>
|
||||||
|
Date: Mon, 2 Jul 2018 23:10:28 -0400
|
||||||
|
Subject: 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 <jason.wessel@windriver.com>
|
||||||
|
cc: Michal Marek <mmarek@suse.cz>
|
||||||
|
cc: linux-kbuild@vger.kernel.org
|
||||||
|
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
|
||||||
|
---
|
||||||
|
scripts/kconfig/mconf-cfg.sh | 8 ++++++++
|
||||||
|
1 file changed, 8 insertions(+)
|
||||||
|
mode change 100755 => 100644 scripts/kconfig/mconf-cfg.sh
|
||||||
|
|
||||||
|
(limited to 'scripts/kconfig/mconf-cfg.sh')
|
||||||
|
|
||||||
|
diff --git a/scripts/kconfig/mconf-cfg.sh b/scripts/kconfig/mconf-cfg.sh
|
||||||
|
old mode 100755
|
||||||
|
new mode 100644
|
||||||
|
index c812872d7f9d..65a9b9e5b8a6
|
||||||
|
--- a/scripts/kconfig/mconf-cfg.sh
|
||||||
|
+++ b/scripts/kconfig/mconf-cfg.sh
|
||||||
|
@@ -4,6 +4,14 @@
|
||||||
|
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 pkg-config)" ]; then
|
||||||
|
if pkg-config --exists $PKG; then
|
||||||
|
echo cflags=\"$(pkg-config --cflags $PKG)\"
|
||||||
|
--
|
||||||
|
cgit v1.2.2-1-g5e49
|
||||||
@@ -11,6 +11,7 @@ SRCREV_meta ?= "ad6f8b357720ca8167a090713b7746230cf4b314"
|
|||||||
|
|
||||||
SRC_URI = "git://git.linaro.org/landing-teams/working/arm/kernel-release.git;name=machine;branch=${KBRANCH}; \
|
SRC_URI = "git://git.linaro.org/landing-teams/working/arm/kernel-release.git;name=machine;branch=${KBRANCH}; \
|
||||||
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.19;destsuffix=${KMETA} \
|
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.19;destsuffix=${KMETA} \
|
||||||
|
file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-location.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
|
LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
|
||||||
|
|||||||
Reference in New Issue
Block a user