From 74bf9ed16c5084fcf32e4ba0782239b6c58b35d0 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Mon, 17 Jul 2023 23:34:36 -0400 Subject: linux-yocto/6.4: fix menuconfig Integrating the following commit(s) to linux-yocto/6.4: Author: Bruce Ashfield Email: bruce.ashfield@gmail.com Subject: mconf: fix output of cflags and libraries Date: Mon, 17 Jul 2023 17:17:55 -0400 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. (From OE-Core rev: 662e83c2eaab723be11e0b4e424d8823998b7f90) Signed-off-by: Bruce Ashfield Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb | 4 ++-- meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb | 4 ++-- meta/recipes-kernel/linux/linux-yocto_6.4.bb | 24 +++++++++++------------ 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb index 26b4eb5658..9273a08c61 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb @@ -14,8 +14,8 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "7682858d44d18f0aef63a29ae7a575fd06b839f1" -SRCREV_meta ?= "ba6cc4ef36e055aaa7710111d55ea30fa0549fc6" +SRCREV_machine ?= "917d160a84f61aada28d09f5afc04d6451fa52a0" +SRCREV_meta ?= "dab56f52aa33b5cea1513b36b98e50a6c7c31f47" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.4;destsuffix=${KMETA};protocol=https" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb index 3bb562789c..39abfcbb08 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb @@ -17,8 +17,8 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "17eff7ed940e09879e95c77bb66d5c3ffaed682e" -SRCREV_meta ?= "ba6cc4ef36e055aaa7710111d55ea30fa0549fc6" +SRCREV_machine ?= "dee78ad1963cff9c063fba486d43fc9670285883" +SRCREV_meta ?= "dab56f52aa33b5cea1513b36b98e50a6c7c31f47" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_6.4.bb b/meta/recipes-kernel/linux/linux-yocto_6.4.bb index 723bf4b0c6..443a89cc1e 100644 --- a/meta/recipes-kernel/linux/linux-yocto_6.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto_6.4.bb @@ -17,18 +17,18 @@ KBRANCH:qemux86-64 ?= "v6.4/standard/base" KBRANCH:qemuloongarch64 ?= "v6.4/standard/base" KBRANCH:qemumips64 ?= "v6.4/standard/mti-malta64" -SRCREV_machine:qemuarm ?= "16c806279fc162e769b1359be53941c210074bb6" -SRCREV_machine:qemuarm64 ?= "17eff7ed940e09879e95c77bb66d5c3ffaed682e" -SRCREV_machine:qemuloongarch64 ?= "17eff7ed940e09879e95c77bb66d5c3ffaed682e" -SRCREV_machine:qemumips ?= "1e22bf901a1b9e56293f93a8f06638608a64944b" -SRCREV_machine:qemuppc ?= "17eff7ed940e09879e95c77bb66d5c3ffaed682e" -SRCREV_machine:qemuriscv64 ?= "17eff7ed940e09879e95c77bb66d5c3ffaed682e" -SRCREV_machine:qemuriscv32 ?= "17eff7ed940e09879e95c77bb66d5c3ffaed682e" -SRCREV_machine:qemux86 ?= "17eff7ed940e09879e95c77bb66d5c3ffaed682e" -SRCREV_machine:qemux86-64 ?= "17eff7ed940e09879e95c77bb66d5c3ffaed682e" -SRCREV_machine:qemumips64 ?= "0dfb1ac4cd963c856a8dc956cf79f561cf56e83f" -SRCREV_machine ?= "17eff7ed940e09879e95c77bb66d5c3ffaed682e" -SRCREV_meta ?= "ba6cc4ef36e055aaa7710111d55ea30fa0549fc6" +SRCREV_machine:qemuarm ?= "aa7642358697dc9be32c4563a3d950f257a3f2ed" +SRCREV_machine:qemuarm64 ?= "dee78ad1963cff9c063fba486d43fc9670285883" +SRCREV_machine:qemuloongarch64 ?= "dee78ad1963cff9c063fba486d43fc9670285883" +SRCREV_machine:qemumips ?= "8a3ac37b45e7dcc98d28ab3920309340202272d9" +SRCREV_machine:qemuppc ?= "dee78ad1963cff9c063fba486d43fc9670285883" +SRCREV_machine:qemuriscv64 ?= "dee78ad1963cff9c063fba486d43fc9670285883" +SRCREV_machine:qemuriscv32 ?= "dee78ad1963cff9c063fba486d43fc9670285883" +SRCREV_machine:qemux86 ?= "dee78ad1963cff9c063fba486d43fc9670285883" +SRCREV_machine:qemux86-64 ?= "dee78ad1963cff9c063fba486d43fc9670285883" +SRCREV_machine:qemumips64 ?= "144ff37fee7f0499574d5b508e4db82234f38fec" +SRCREV_machine ?= "dee78ad1963cff9c063fba486d43fc9670285883" +SRCREV_meta ?= "dab56f52aa33b5cea1513b36b98e50a6c7c31f47" # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll # get the /base branch, which is pure upstream -stable, and the same -- cgit v1.2.3-54-g00ecf