From: Fabio Berton Date: Fri, 14 Jun 2019 19:19:02 +0000 (-0300) Subject: linux-fslc-lts: Bump revision to 55fcc545ad14 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=14fea2f4ae506bb4d6bb7b9e2e1acdc10f84d3d2;p=meta-freescale.git 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 --- 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 LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -PV = "4.19.45+git${SRCPV}" +PV = "4.19.50+git${SRCPV}" SRCBRANCH = "4.19.x+fslc" -SRCREV = "0b9ff033797a2adea1385bc73947f21bce2fbddc" +SRCREV = "55fcc545ad14ddc594c30ae35dbbb403d240b9d6" 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 DEPENDS += "lzop-native bc-native" SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${SRCBRANCH} \ - file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch \ file://defconfig" 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 @@ -From 846b11d8c834af4fa62393dadb490ea8246b332c Mon Sep 17 00:00:00 2001 -From: Bruce Ashfield -Date: Mon, 2 Jul 2018 23:10:28 -0400 -Subject: [PATCH] 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. - -Stolen from linux-yocto [1] - -[1] http://git.yoctoproject.org/cgit.cgi/linux-yocto/commit/?id=846b11d8c834af4fa62393dadb490ea8246b332c - -Upstream-Status: Pending - -Signed-off-by: Jason Wessel -cc: Michal Marek -cc: linux-kbuild@vger.kernel.org -Signed-off-by: Bruce Ashfield ---- - scripts/kconfig/mconf-cfg.sh | 8 ++++++++ - 1 file changed, 8 insertions(+) - mode change 100755 => 100644 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)\" --- -2.20.1 -