Refreshed and include patches from linux-yocto 6.6 to detect ncurses correctly when cross-compiling.
Signed-off-by: Naveen Saini <[email protected]> --- recipes-kernel/linux/linux-intel.inc | 1 + ...-cfg-Allow-specification-of-ncurses-.patch | 22 +++++----- ...f-fix-output-of-cflags-and-libraries.patch | 40 +++++++++++++++++++ 3 files changed, 52 insertions(+), 11 deletions(-) create mode 100644 recipes-kernel/linux/linux-intel/0002-mconf-fix-output-of-cflags-and-libraries.patch diff --git a/recipes-kernel/linux/linux-intel.inc b/recipes-kernel/linux/linux-intel.inc index 7f81fc18..8f726627 100644 --- a/recipes-kernel/linux/linux-intel.inc +++ b/recipes-kernel/linux/linux-intel.inc @@ -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}" diff --git a/recipes-kernel/linux/linux-intel/0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch b/recipes-kernel/linux/linux-intel/0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch index 9aff37de..a601e783 100644 --- a/recipes-kernel/linux/linux-intel/0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch +++ b/recipes-kernel/linux/linux-intel/0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch @@ -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 <[email protected]> -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: [email protected] Signed-off-by: Bruce Ashfield <[email protected]> Signed-off-by: Naveen Saini <[email protected]> --- - 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 diff --git a/recipes-kernel/linux/linux-intel/0002-mconf-fix-output-of-cflags-and-libraries.patch b/recipes-kernel/linux/linux-intel/0002-mconf-fix-output-of-cflags-and-libraries.patch new file mode 100644 index 00000000..a96b68d9 --- /dev/null +++ b/recipes-kernel/linux/linux-intel/0002-mconf-fix-output-of-cflags-and-libraries.patch @@ -0,0 +1,40 @@ +From 1b53d82a8152843afcddd7f16b0c43b6b4f22895 Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <[email protected]> +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 <[email protected]> +Signed-off-by: Naveen Saini <[email protected]> +--- + 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 + -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#8204): https://lists.yoctoproject.org/g/meta-intel/message/8204 Mute This Topic: https://lists.yoctoproject.org/mt/103781879/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-intel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
