From aceec5ee12f1fc32d66e34b047c961f2b271bc06 Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Thu, 24 Mar 2022 17:23:51 +0100 Subject: kernel.bbclass: avoid config changes based on the availability of pahole CONFIG_PAHOLE_HAS_SPLIT_BTF shows up in the config only when pahole is installed on the host system. As a result, the config changes depending on whether pahole is installed or not. Set PAHOLE=false to ensure that it is never found. If this is actually needed in the future, then we can add an option for it and create a host package for pahole. (From OE-Core rev: 43b0eca2f3fc41a0d2ba7c7679687a3e0eb54b45) Signed-off-by: Michael Olbrich [afa: ported from PTXdist 0c0cec2288 to OE-core] Signed-off-by: Ahmad Fatoum Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- meta/classes/kernel.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta/classes/kernel.bbclass') diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 4f304eb9c7..b3bbd3b276 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -234,7 +234,7 @@ UBOOT_LOADADDRESS ?= "${UBOOT_ENTRYPOINT}" KERNEL_EXTRA_ARGS ?= "" EXTRA_OEMAKE = " HOSTCC="${BUILD_CC}" HOSTCFLAGS="${BUILD_CFLAGS}" HOSTLDFLAGS="${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}"" -EXTRA_OEMAKE += " HOSTCXX="${BUILD_CXX}" HOSTCXXFLAGS="${BUILD_CXXFLAGS}"" +EXTRA_OEMAKE += " HOSTCXX="${BUILD_CXX}" HOSTCXXFLAGS="${BUILD_CXXFLAGS}" PAHOLE=false" KERNEL_ALT_IMAGETYPE ??= "" @@ -639,7 +639,7 @@ addtask savedefconfig after do_configure inherit cml1 -KCONFIG_CONFIG_COMMAND:append = " LD='${KERNEL_LD}' HOSTLDFLAGS='${BUILD_LDFLAGS}'" +KCONFIG_CONFIG_COMMAND:append = " PAHOLE=false LD='${KERNEL_LD}' HOSTLDFLAGS='${BUILD_LDFLAGS}'" EXPORT_FUNCTIONS do_compile do_transform_kernel do_transform_bundled_initramfs do_install do_configure -- cgit v1.2.3-54-g00ecf