From: Yogesh Tyagi <[email protected]> Refresh 0002-mconf patch for new kconfig infrastructure.
Release Notes: https://github.com/intel/linux-intel-lts/releases/tag/ lts-v6.12.61-linux-251229T065211Z Signed-off-by: Yogesh Tyagi <[email protected]> --- ...f-fix-output-of-cflags-and-libraries.patch | 41 ++++++++++--------- recipes-kernel/linux/linux-intel_6.12.bb | 6 +-- 2 files changed, 24 insertions(+), 23 deletions(-) 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 index a96b68d9..4905c98c 100644 --- 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 @@ -3,38 +3,39 @@ 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. +The kconfig infrastructure has changed how flags are detected and +output. 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 adjust our CROSS ncurses patch accordingly to work with the new +infrastructure while maintaining cross-compilation support. -We'll eventually be able to drop this patch, but not quite yet. - -Upstream-Status: Inappropriate [OE-Specific] +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(-) + 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 38cf8304bb31..a5ae56e08b07 100755 +index 1bc304dc2..dde985a55 100755 --- a/scripts/kconfig/mconf-cfg.sh +++ b/scripts/kconfig/mconf-cfg.sh -@@ -8,9 +8,9 @@ PKG="ncursesw" +@@ -9,6 +9,14 @@ libs=$2 + PKG="ncursesw" PKG2="ncurses" - if [ "$CROSS_CURSES_LIB" != "" ]; then -- echo libs=\'$CROSS_CURSES_LIB\' ++if [ "$CROSS_CURSES_LIB" != "" ]; then + echo $CROSS_CURSES_LIB > ${libs} - if [ x"$CROSS_CURSES_INC" != x ]; then -- echo cflags=\'$CROSS_CURSES_INC\' ++ if [ x"$CROSS_CURSES_INC" != x ]; then + echo $CROSS_CURSES_INC > ${cflags} - fi - exit 0 - fi ++ fi ++ exit 0 ++fi ++ + if [ -n "$(command -v ${HOSTPKG_CONFIG})" ]; then + if ${HOSTPKG_CONFIG} --exists $PKG; then + ${HOSTPKG_CONFIG} --cflags ${PKG} > ${cflags} -- -2.34.1 +2.43.0 diff --git a/recipes-kernel/linux/linux-intel_6.12.bb b/recipes-kernel/linux/linux-intel_6.12.bb index a5f1b36c..aa8817f0 100644 --- a/recipes-kernel/linux/linux-intel_6.12.bb +++ b/recipes-kernel/linux/linux-intel_6.12.bb @@ -11,9 +11,9 @@ DEPENDS += "elfutils-native openssl-native util-linux-native" LINUX_VERSION_EXTENSION ??= "-intel-pk-${LINUX_KERNEL_TYPE}" -LINUX_VERSION ?= "6.12.55" -SRCREV_machine ?= "c3bbfd2c597887277403965361c99642001d7439" -SRCREV_meta ?= "3f0dcb29edf14029f130bc493a939b67ea27852e" +LINUX_VERSION ?= "6.12.61" +SRCREV_machine ?= "7190df9cb5fc10c673e960b7144d470fcd373627" +SRCREV_meta ?= "46ae7e7d4ce1ee55091957bff63e0f54a761a93d" # Functionality flags KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc \ -- 2.43.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#8692): https://lists.yoctoproject.org/g/meta-intel/message/8692 Mute This Topic: https://lists.yoctoproject.org/mt/117592172/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-intel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
