[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openembedded-core
Subject:    [OE-core][mickledore 5/5] linux-yocto: make sure the pahole-native available before do_kernel_config
From:       "Steve Sakoman" <steve () sakoman ! com>
Date:       2023-10-31 15:35:44
Message-ID: a94b29ef5f64c7d71bb6af56458427f347179997.1698766338.git.steve () sakoman ! com
[Download RAW message or body]

Content-Transfer-Encoding: 8bit

From: Xiangyu Chen <xiangyu.chen@windriver.com>

When using debug-btf.scc in a clean workspace, the CONFIG_MODULE_ALLOW_BTF_MISMATCH \
cannot apply to kernel until clean the kernel code(bitbake linux-yocto -c cleanall) \
and rebuild.

After tracking the code, some options depend on CONFIG_PAHOLE_VERSION, it was \
generated by scripts/pahole-version.sh in kernel, but during do_kernel_configme step, \
the pahole-native is not available in sysroot-native, so need to wait pahole-native \
install to sysroot-native before do_kernel_configme.

(cherry picked from commit 217a4db53edbd88001f6390bbff39e5dd3d137af)
Signed-off-by: Xiangyu Chen <xiangyu.chen@windriver.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
 meta/recipes-kernel/linux/linux-yocto.inc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-kernel/linux/linux-yocto.inc \
b/meta/recipes-kernel/linux/linux-yocto.inc index 04a8105e17..461e5684cd 100644
--- a/meta/recipes-kernel/linux/linux-yocto.inc
+++ b/meta/recipes-kernel/linux/linux-yocto.inc
@@ -65,7 +65,10 @@ KERNEL_DEBUG ?= ""
 DEPENDS += '${@bb.utils.contains_any("ARCH", [ "x86", "arm64" ], "elfutils-native", \
"", d)}'  DEPENDS += "openssl-native util-linux-native"
 DEPENDS += "gmp-native libmpc-native"
-DEPENDS += '${@bb.utils.contains("KERNEL_DEBUG", "True", "pahole-native", "", d)}'
+
+# Some options depend on CONFIG_PAHOLE_VERSION, so need to make pahole-native \
available before do_kernel_configme +do_kernel_configme[depends] += \
'${@bb.utils.contains("KERNEL_DEBUG", "True", "pahole-native:do_populate_sysroot", \
"", d)}' +
 EXTRA_OEMAKE += '${@bb.utils.contains("KERNEL_DEBUG", "True", "", "PAHOLE=false", \
d)}'  
 do_devshell:prepend() {
-- 
2.34.1



-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#189857): https://lists.openembedded.org/g/openembedded-core/message/189857
Mute This Topic: https://lists.openembedded.org/mt/102299571/4454766
Group Owner: openembedded-core+owner@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [openembedded-core@marc.info]
-=-=-=-=-=-=-=-=-=-=-=-



[prev in list] [next in list] [prev in thread] [next in thread]