diff options
author | Fabio Berton <fabio.berton@ossystems.com.br> | 2019-06-14 16:19:02 -0300 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2019-06-21 18:16:27 -0300 |
commit | a8f3d5749e69c5a64d7dd179d367159763b898ab (patch) | |
tree | f93127b2850aceb48f36d46a56ca41858fa97458 | |
parent | e53bafea3cad0366146ef2963ae2374b4b9095fb (diff) | |
download | meta-freescale-a8f3d5749e69c5a64d7dd179d367159763b898ab.tar.gz |
linux-fslc-lts: Bump revision to 55fcc545ad14
This commit merges tag 4.19.50 into fslc branch and apply patch:
- menuconfig,mconf-cfg: Allow specification of ncurses location
Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
3 files changed, 2 insertions, 60 deletions
diff --git a/recipes-kernel/linux/linux-fslc-lts-4.19.bb b/recipes-kernel/linux/linux-fslc-lts-4.19.bb index 45b1a57c..38ecdc8b 100644 --- a/recipes-kernel/linux/linux-fslc-lts-4.19.bb +++ b/recipes-kernel/linux/linux-fslc-lts-4.19.bb | |||
@@ -11,9 +11,9 @@ include linux-fslc.inc | |||
11 | 11 | ||
12 | LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" | 12 | LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" |
13 | 13 | ||
14 | PV = "4.19.45+git${SRCPV}" | 14 | PV = "4.19.50+git${SRCPV}" |
15 | 15 | ||
16 | SRCBRANCH = "4.19.x+fslc" | 16 | SRCBRANCH = "4.19.x+fslc" |
17 | SRCREV = "0b9ff033797a2adea1385bc73947f21bce2fbddc" | 17 | SRCREV = "55fcc545ad14ddc594c30ae35dbbb403d240b9d6" |
18 | 18 | ||
19 | COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf|use-mainline-bsp)" | 19 | COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf|use-mainline-bsp)" |
diff --git a/recipes-kernel/linux/linux-fslc.inc b/recipes-kernel/linux/linux-fslc.inc index 520d88ec..f6d04d59 100644 --- a/recipes-kernel/linux/linux-fslc.inc +++ b/recipes-kernel/linux/linux-fslc.inc | |||
@@ -6,6 +6,5 @@ require recipes-kernel/linux/linux-imx.inc | |||
6 | DEPENDS += "lzop-native bc-native" | 6 | DEPENDS += "lzop-native bc-native" |
7 | 7 | ||
8 | SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${SRCBRANCH} \ | 8 | SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${SRCBRANCH} \ |
9 | file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch \ | ||
10 | file://defconfig" | 9 | file://defconfig" |
11 | LOCALVERSION = "-fslc" | 10 | LOCALVERSION = "-fslc" |
diff --git a/recipes-kernel/linux/linux-fslc/0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch b/recipes-kernel/linux/linux-fslc/0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch deleted file mode 100644 index 73182b95..00000000 --- a/recipes-kernel/linux/linux-fslc/0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch +++ /dev/null | |||
@@ -1,57 +0,0 @@ | |||
1 | From 846b11d8c834af4fa62393dadb490ea8246b332c 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 | Stolen from linux-yocto [1] | ||
20 | |||
21 | [1] http://git.yoctoproject.org/cgit.cgi/linux-yocto/commit/?id=846b11d8c834af4fa62393dadb490ea8246b332c | ||
22 | |||
23 | Upstream-Status: Pending | ||
24 | |||
25 | Signed-off-by: Jason Wessel <jason.wessel@windriver.com> | ||
26 | cc: Michal Marek <mmarek@suse.cz> | ||
27 | cc: linux-kbuild@vger.kernel.org | ||
28 | Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> | ||
29 | --- | ||
30 | scripts/kconfig/mconf-cfg.sh | 8 ++++++++ | ||
31 | 1 file changed, 8 insertions(+) | ||
32 | mode change 100755 => 100644 scripts/kconfig/mconf-cfg.sh | ||
33 | |||
34 | diff --git a/scripts/kconfig/mconf-cfg.sh b/scripts/kconfig/mconf-cfg.sh | ||
35 | old mode 100755 | ||
36 | new mode 100644 | ||
37 | index c812872d7f9d..65a9b9e5b8a6 | ||
38 | --- a/scripts/kconfig/mconf-cfg.sh | ||
39 | +++ b/scripts/kconfig/mconf-cfg.sh | ||
40 | @@ -4,6 +4,14 @@ | ||
41 | PKG="ncursesw" | ||
42 | PKG2="ncurses" | ||
43 | |||
44 | +if [ "$CROSS_CURSES_LIB" != "" ]; then | ||
45 | + echo libs=\'$CROSS_CURSES_LIB\' | ||
46 | + if [ x"$CROSS_CURSES_INC" != x ]; then | ||
47 | + echo cflags=\'$CROSS_CURSES_INC\' | ||
48 | + fi | ||
49 | + exit 0 | ||
50 | +fi | ||
51 | + | ||
52 | if [ -n "$(command -v pkg-config)" ]; then | ||
53 | if pkg-config --exists $PKG; then | ||
54 | echo cflags=\"$(pkg-config --cflags $PKG)\" | ||
55 | -- | ||
56 | 2.20.1 | ||
57 | |||