diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2023-07-17 23:34:36 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-07-21 11:52:26 +0100 |
commit | 74bf9ed16c5084fcf32e4ba0782239b6c58b35d0 (patch) | |
tree | 3357a4f888d0025d70925b06ab5497a42458887d | |
parent | 74b670cf0bbd0e9a5a862f34586917f95b84ae01 (diff) | |
download | poky-74bf9ed16c5084fcf32e4ba0782239b6c58b35d0.tar.gz |
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 <bruce.ashfield@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb | 4 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb | 4 | ||||
-rw-r--r-- | 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 () { | |||
14 | raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") | 14 | raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") |
15 | } | 15 | } |
16 | 16 | ||
17 | SRCREV_machine ?= "7682858d44d18f0aef63a29ae7a575fd06b839f1" | 17 | SRCREV_machine ?= "917d160a84f61aada28d09f5afc04d6451fa52a0" |
18 | SRCREV_meta ?= "ba6cc4ef36e055aaa7710111d55ea30fa0549fc6" | 18 | SRCREV_meta ?= "dab56f52aa33b5cea1513b36b98e50a6c7c31f47" |
19 | 19 | ||
20 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \ | 20 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \ |
21 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.4;destsuffix=${KMETA};protocol=https" | 21 | 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" | |||
17 | KMETA = "kernel-meta" | 17 | KMETA = "kernel-meta" |
18 | KCONF_BSP_AUDIT_LEVEL = "2" | 18 | KCONF_BSP_AUDIT_LEVEL = "2" |
19 | 19 | ||
20 | SRCREV_machine ?= "17eff7ed940e09879e95c77bb66d5c3ffaed682e" | 20 | SRCREV_machine ?= "dee78ad1963cff9c063fba486d43fc9670285883" |
21 | SRCREV_meta ?= "ba6cc4ef36e055aaa7710111d55ea30fa0549fc6" | 21 | SRCREV_meta ?= "dab56f52aa33b5cea1513b36b98e50a6c7c31f47" |
22 | 22 | ||
23 | PV = "${LINUX_VERSION}+git${SRCPV}" | 23 | PV = "${LINUX_VERSION}+git${SRCPV}" |
24 | 24 | ||
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" | |||
17 | KBRANCH:qemuloongarch64 ?= "v6.4/standard/base" | 17 | KBRANCH:qemuloongarch64 ?= "v6.4/standard/base" |
18 | KBRANCH:qemumips64 ?= "v6.4/standard/mti-malta64" | 18 | KBRANCH:qemumips64 ?= "v6.4/standard/mti-malta64" |
19 | 19 | ||
20 | SRCREV_machine:qemuarm ?= "16c806279fc162e769b1359be53941c210074bb6" | 20 | SRCREV_machine:qemuarm ?= "aa7642358697dc9be32c4563a3d950f257a3f2ed" |
21 | SRCREV_machine:qemuarm64 ?= "17eff7ed940e09879e95c77bb66d5c3ffaed682e" | 21 | SRCREV_machine:qemuarm64 ?= "dee78ad1963cff9c063fba486d43fc9670285883" |
22 | SRCREV_machine:qemuloongarch64 ?= "17eff7ed940e09879e95c77bb66d5c3ffaed682e" | 22 | SRCREV_machine:qemuloongarch64 ?= "dee78ad1963cff9c063fba486d43fc9670285883" |
23 | SRCREV_machine:qemumips ?= "1e22bf901a1b9e56293f93a8f06638608a64944b" | 23 | SRCREV_machine:qemumips ?= "8a3ac37b45e7dcc98d28ab3920309340202272d9" |
24 | SRCREV_machine:qemuppc ?= "17eff7ed940e09879e95c77bb66d5c3ffaed682e" | 24 | SRCREV_machine:qemuppc ?= "dee78ad1963cff9c063fba486d43fc9670285883" |
25 | SRCREV_machine:qemuriscv64 ?= "17eff7ed940e09879e95c77bb66d5c3ffaed682e" | 25 | SRCREV_machine:qemuriscv64 ?= "dee78ad1963cff9c063fba486d43fc9670285883" |
26 | SRCREV_machine:qemuriscv32 ?= "17eff7ed940e09879e95c77bb66d5c3ffaed682e" | 26 | SRCREV_machine:qemuriscv32 ?= "dee78ad1963cff9c063fba486d43fc9670285883" |
27 | SRCREV_machine:qemux86 ?= "17eff7ed940e09879e95c77bb66d5c3ffaed682e" | 27 | SRCREV_machine:qemux86 ?= "dee78ad1963cff9c063fba486d43fc9670285883" |
28 | SRCREV_machine:qemux86-64 ?= "17eff7ed940e09879e95c77bb66d5c3ffaed682e" | 28 | SRCREV_machine:qemux86-64 ?= "dee78ad1963cff9c063fba486d43fc9670285883" |
29 | SRCREV_machine:qemumips64 ?= "0dfb1ac4cd963c856a8dc956cf79f561cf56e83f" | 29 | SRCREV_machine:qemumips64 ?= "144ff37fee7f0499574d5b508e4db82234f38fec" |
30 | SRCREV_machine ?= "17eff7ed940e09879e95c77bb66d5c3ffaed682e" | 30 | SRCREV_machine ?= "dee78ad1963cff9c063fba486d43fc9670285883" |
31 | SRCREV_meta ?= "ba6cc4ef36e055aaa7710111d55ea30fa0549fc6" | 31 | SRCREV_meta ?= "dab56f52aa33b5cea1513b36b98e50a6c7c31f47" |
32 | 32 | ||
33 | # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll | 33 | # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll |
34 | # get the <version>/base branch, which is pure upstream -stable, and the same | 34 | # get the <version>/base branch, which is pure upstream -stable, and the same |