diff options
author | Xiangyu Chen <xiangyu.chen@windriver.com> | 2023-10-30 13:29:25 +0800 |
---|---|---|
committer | Steve Sakoman <steve@sakoman.com> | 2023-11-11 08:23:01 -1000 |
commit | 155c80d7edc71ff22bdb9ba6f74184f25f60b2fa (patch) | |
tree | e999c53f52cf7cea18f12fe0233148d011749dc3 | |
parent | 0e5f980f1c070b6e696222fb93a7710023ed7d04 (diff) | |
download | poky-155c80d7edc71ff22bdb9ba6f74184f25f60b2fa.tar.gz |
linux-yocto: make sure the pahole-native available before do_kernel_configme
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)
(From OE-Core rev: b535bf84a03dca7ed3f54ef1d0bc9da78756a9d8)
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>
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto.inc | 5 |
1 files changed, 4 insertions, 1 deletions
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 ?= "" | |||
65 | DEPENDS += '${@bb.utils.contains_any("ARCH", [ "x86", "arm64" ], "elfutils-native", "", d)}' | 65 | DEPENDS += '${@bb.utils.contains_any("ARCH", [ "x86", "arm64" ], "elfutils-native", "", d)}' |
66 | DEPENDS += "openssl-native util-linux-native" | 66 | DEPENDS += "openssl-native util-linux-native" |
67 | DEPENDS += "gmp-native libmpc-native" | 67 | DEPENDS += "gmp-native libmpc-native" |
68 | DEPENDS += '${@bb.utils.contains("KERNEL_DEBUG", "True", "pahole-native", "", d)}' | 68 | |
69 | # Some options depend on CONFIG_PAHOLE_VERSION, so need to make pahole-native available before do_kernel_configme | ||
70 | do_kernel_configme[depends] += '${@bb.utils.contains("KERNEL_DEBUG", "True", "pahole-native:do_populate_sysroot", "", d)}' | ||
71 | |||
69 | EXTRA_OEMAKE += '${@bb.utils.contains("KERNEL_DEBUG", "True", "", "PAHOLE=false", d)}' | 72 | EXTRA_OEMAKE += '${@bb.utils.contains("KERNEL_DEBUG", "True", "", "PAHOLE=false", d)}' |
70 | 73 | ||
71 | do_devshell:prepend() { | 74 | do_devshell:prepend() { |