diff options
| author | Yogesh Tyagi <yogesh.tyagi@intel.com> | 2026-01-27 16:56:52 +0530 |
|---|---|---|
| committer | Yogesh Tyagi <yogesh.tyagi@intel.com> | 2026-01-27 16:56:52 +0530 |
| commit | 4c6aaa4dd40b56a91f4bb6453a775e3a126c4a63 (patch) | |
| tree | 57ced2ade3670ae4df9dea4493bed4ca5cbbdc8f | |
| parent | e4981dbe234a1bde75e01bedd0659dade0d1cf0b (diff) | |
| download | meta-intel-4c6aaa4dd40b56a91f4bb6453a775e3a126c4a63.tar.gz | |
linux-intel : upgrade 6.12.55 -> 6.12.61
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 <yogesh.tyagi@intel.com>
| -rw-r--r-- | recipes-kernel/linux/linux-intel/0002-mconf-fix-output-of-cflags-and-libraries.patch | 41 | ||||
| -rw-r--r-- | 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 <bruce.ashfield@gmail.com> | |||
| 3 | Date: Mon, 17 Jul 2023 17:17:55 -0400 | 3 | Date: Mon, 17 Jul 2023 17:17:55 -0400 |
| 4 | Subject: [PATCH 2/2] mconf: fix output of cflags and libraries | 4 | Subject: [PATCH 2/2] mconf: fix output of cflags and libraries |
| 5 | 5 | ||
| 6 | commit 3122c84409d578a5df8bcb1 [kconfig: refactor Makefile to reduce | 6 | The kconfig infrastructure has changed how flags are detected and |
| 7 | process forks] changes the way that flags are detected. They are | 7 | output. They are no longer just echo'd and captured, they are |
| 8 | no longer just echo'd and captured, they are written to a file and | 8 | written to a file and later read. |
| 9 | later read. | ||
| 10 | 9 | ||
| 11 | We adjust our CROSS ncurses patch accordingly. | 10 | We adjust our CROSS ncurses patch accordingly to work with the new |
| 11 | infrastructure while maintaining cross-compilation support. | ||
| 12 | 12 | ||
| 13 | We'll eventually be able to drop this patch, but not quite yet. | 13 | Upstream-Status: Inappropriate [OE-Specific] |
| 14 | |||
| 15 | Upstream-Status: Inappropriate [OE-Specific] | ||
| 16 | Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> | 14 | Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> |
| 17 | Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> | 15 | Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> |
| 18 | --- | 16 | --- |
| 19 | scripts/kconfig/mconf-cfg.sh | 4 ++-- | 17 | scripts/kconfig/mconf-cfg.sh | 8 ++++++++ |
| 20 | 1 file changed, 2 insertions(+), 2 deletions(-) | 18 | 1 file changed, 8 insertions(+) |
| 21 | 19 | ||
| 22 | diff --git a/scripts/kconfig/mconf-cfg.sh b/scripts/kconfig/mconf-cfg.sh | 20 | diff --git a/scripts/kconfig/mconf-cfg.sh b/scripts/kconfig/mconf-cfg.sh |
| 23 | index 38cf8304bb31..a5ae56e08b07 100755 | 21 | index 1bc304dc2..dde985a55 100755 |
| 24 | --- a/scripts/kconfig/mconf-cfg.sh | 22 | --- a/scripts/kconfig/mconf-cfg.sh |
| 25 | +++ b/scripts/kconfig/mconf-cfg.sh | 23 | +++ b/scripts/kconfig/mconf-cfg.sh |
| 26 | @@ -8,9 +8,9 @@ PKG="ncursesw" | 24 | @@ -9,6 +9,14 @@ libs=$2 |
| 25 | PKG="ncursesw" | ||
| 27 | PKG2="ncurses" | 26 | PKG2="ncurses" |
| 28 | 27 | ||
| 29 | if [ "$CROSS_CURSES_LIB" != "" ]; then | 28 | +if [ "$CROSS_CURSES_LIB" != "" ]; then |
| 30 | - echo libs=\'$CROSS_CURSES_LIB\' | ||
| 31 | + echo $CROSS_CURSES_LIB > ${libs} | 29 | + echo $CROSS_CURSES_LIB > ${libs} |
| 32 | if [ x"$CROSS_CURSES_INC" != x ]; then | 30 | + if [ x"$CROSS_CURSES_INC" != x ]; then |
| 33 | - echo cflags=\'$CROSS_CURSES_INC\' | ||
| 34 | + echo $CROSS_CURSES_INC > ${cflags} | 31 | + echo $CROSS_CURSES_INC > ${cflags} |
| 35 | fi | 32 | + fi |
| 36 | exit 0 | 33 | + exit 0 |
| 37 | fi | 34 | +fi |
| 35 | + | ||
| 36 | if [ -n "$(command -v ${HOSTPKG_CONFIG})" ]; then | ||
| 37 | if ${HOSTPKG_CONFIG} --exists $PKG; then | ||
| 38 | ${HOSTPKG_CONFIG} --cflags ${PKG} > ${cflags} | ||
| 38 | -- | 39 | -- |
| 39 | 2.34.1 | 40 | 2.43.0 |
| 40 | 41 | ||
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" | |||
| 11 | 11 | ||
| 12 | LINUX_VERSION_EXTENSION ??= "-intel-pk-${LINUX_KERNEL_TYPE}" | 12 | LINUX_VERSION_EXTENSION ??= "-intel-pk-${LINUX_KERNEL_TYPE}" |
| 13 | 13 | ||
| 14 | LINUX_VERSION ?= "6.12.55" | 14 | LINUX_VERSION ?= "6.12.61" |
| 15 | SRCREV_machine ?= "c3bbfd2c597887277403965361c99642001d7439" | 15 | SRCREV_machine ?= "7190df9cb5fc10c673e960b7144d470fcd373627" |
| 16 | SRCREV_meta ?= "3f0dcb29edf14029f130bc493a939b67ea27852e" | 16 | SRCREV_meta ?= "46ae7e7d4ce1ee55091957bff63e0f54a761a93d" |
| 17 | 17 | ||
| 18 | # Functionality flags | 18 | # Functionality flags |
| 19 | KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc \ | 19 | KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc \ |
