summaryrefslogtreecommitdiffstats
path: root/recipes-extended/xen/files/0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-location.patch
diff options
context:
space:
mode:
authorDiego Sueiro <diego.sueiro@arm.com>2020-08-14 10:56:33 +0100
committerBruce Ashfield <bruce.ashfield@gmail.com>2020-08-27 16:28:58 -0400
commitb2cd5f340ea220360e3fb90282c75994d9e553ca (patch)
tree0176b728f0cd154e0ddf7ac1738864731f1d7cd6 /recipes-extended/xen/files/0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-location.patch
parent3fafab50cf510a99ad1d0ab4e6f0402721716b35 (diff)
downloadmeta-virtualization-b2cd5f340ea220360e3fb90282c75994d9e553ca.tar.gz
xen: Fix menuconfig and add support for config fragments and diffconfig
This patch introduces the following changes: 1. When building in OE environment the linker path needs to be passed when buildind the Kconfig tool in order to get the menuconfig task properly working. 2. By inheriting cml1.bbclass we can drop some environment variables settings in xen-hypervisor.inc for the menuconfig task, and also be able to search for config fragmens and use the diffconfig task. Also, there is no need to have a custom do_menuconfig task anymore. Change-Id: I8d61ec76d92de7d1613b79edf55b4868fe712334 Signed-off-by: Diego Sueiro <diego.sueiro@arm.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat (limited to 'recipes-extended/xen/files/0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-location.patch')
-rw-r--r--recipes-extended/xen/files/0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-location.patch49
1 files changed, 49 insertions, 0 deletions
diff --git a/recipes-extended/xen/files/0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-location.patch b/recipes-extended/xen/files/0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-location.patch
new file mode 100644
index 00000000..22b67c40
--- /dev/null
+++ b/recipes-extended/xen/files/0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-location.patch
@@ -0,0 +1,49 @@
1Upstream-Status: Xen: Inappropriate [oe specific, cross compile issue]
2Upstream-Status: Kernel: Pending
3Signed-off-by: Diego Sueiro <diego.sueiro@arm.com>
4commit e6972e689a980ab28637e94e48c77eeace6abde5
5Author: Bruce Ashfield <bruce.ashfield@windriver.com>
6Date: Mon Jul 2 23:10:28 2018 -0400
7
8 xen/kconfig,menuconfig,mconf-cfg: Allow specification of ncurses location
9
10 In some cross build environments such as the Yocto Project build
11 environment it provides an ncurses library that is compiled
12 differently than the host's version. This causes display corruption
13 problems when the host's curses includes are used instead of the
14 includes from the provided compiler are overridden. There is a second
15 case where there is no curses libraries at all on the host system and
16 menuconfig will just fail entirely.
17
18 The solution is simply to allow an override variable in
19 check-lxdialog.sh for environments such as the Yocto Project. Adding
20 a CROSS_CURSES_LIB and CROSS_CURSES_INC solves the issue and allowing
21 compiling and linking against the right headers and libraries.
22
23 Change-Id: Ibe8dfafc90655e3be2671dbbb0cb7f5631fc4d44
24 Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
25 cc: Michal Marek <mmarek@suse.cz>
26 cc: linux-kbuild@vger.kernel.org
27 Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
28
29diff --git a/xen/tools/kconfig/mconf-cfg.sh b/xen/tools/kconfig/mconf-cfg.sh
30old mode 100755
31new mode 100644
32index c812872..65a9b9e
33--- a/xen/tools/kconfig/mconf-cfg.sh
34+++ b/xen/tools/kconfig/mconf-cfg.sh
35@@ -4,6 +4,14 @@
36 PKG="ncursesw"
37 PKG2="ncurses"
38
39+if [ "$CROSS_CURSES_LIB" != "" ]; then
40+ echo libs=\'$CROSS_CURSES_LIB\'
41+ if [ x"$CROSS_CURSES_INC" != x ]; then
42+ echo cflags=\'$CROSS_CURSES_INC\'
43+ fi
44+ exit 0
45+fi
46+
47 if [ -n "$(command -v pkg-config)" ]; then
48 if pkg-config --exists $PKG; then
49 echo cflags=\"$(pkg-config --cflags $PKG)\"