| Message ID | 20231026063848.3972419-1-xiangyu.chen@eng.windriver.com |
|---|---|
| State | Accepted, archived |
| Commit | 217a4db53edbd88001f6390bbff39e5dd3d137af |
| Headers | show |
| Series | linux-yocto: make sure the pahole-native available before do_kernel_configme | expand |
On Thu, Oct 26, 2023 at 2:39 AM Xiangyu Chen <xiangyu.chen@eng.windriver.com> wrote: > > 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. > No concerns here, since the end result is the same, just available earlier in the tasks/build. Acked-by: Bruce Ashfield <bruce.ashfield@gmail.com> > Signed-off-by: Xiangyu Chen <xiangyu.chen@windriver.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 0cc303c009..0132fcffb3 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", "powerpc" ], "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 (#189698): https://lists.openembedded.org/g/openembedded-core/message/189698 > Mute This Topic: https://lists.openembedded.org/mt/102195199/1050810 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [bruce.ashfield@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
diff --git a/meta/recipes-kernel/linux/linux-yocto.inc b/meta/recipes-kernel/linux/linux-yocto.inc index 0cc303c009..0132fcffb3 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", "powerpc" ], "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() {