From: "mark.yang" <[email protected]>
Setting TOOLCHAIN on the kernel recipe alone leaves modules and
make-mod-scripts running make against the shared build tree with gcc;
kbuild spots the CC_VERSION_TEXT mismatch and silently regenerates
the shared .config. Add a KERNEL_TOOLCHAIN switch so the kernel,
modules and make-mod-scripts change toolchain together, gcc by default.
Set TOOLCHAIN from it in the kbuild consumers rather than in
kernel-arch: kernel-arch is also inherited by u-boot and barebox for
the ARCH mapping, and the u-boot kbuild hardcodes ${CROSS_COMPILE}gcc,
so switching them too would drop the gcc cross dependency they need:
/bin/sh: 1: x86_64-oe-linux-gcc: not found
Full log: https://errors.yoctoproject.org/Errors/Build/242654/
Signed-off-by: mark.yang <[email protected]>
---
Resending with the 3/3 numbering restored; the first posting went out
as [PATCH v3] so patchwork split it from the series. No changes to the
patch itself.
v3: set TOOLCHAIN from the kbuild consumers instead of kernel-arch,
which is also inherited by u-boot and barebox
v2: rebased on the merged clang toolchain support which supersedes
the other v1 patches; dependency changes split out into patch 2
meta/classes-recipe/kernel-arch.bbclass | 1 +
meta/classes-recipe/kernel.bbclass | 1 +
meta/classes-recipe/module-base.bbclass | 1 +
meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb | 1 +
4 files changed, 4 insertions(+)
diff --git a/meta/classes-recipe/kernel-arch.bbclass
b/meta/classes-recipe/kernel-arch.bbclass
index 321c9ed577..b15e0aca80 100644
--- a/meta/classes-recipe/kernel-arch.bbclass
+++ b/meta/classes-recipe/kernel-arch.bbclass
@@ -92,4 +92,5 @@ KERNEL_LD:toolchain-clang =
"${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld'
KERNEL_AR:toolchain-clang = "llvm-ar ${HOST_AR_KERNEL_ARCH}"
KERNEL_OBJCOPY:toolchain-clang = "llvm-objcopy ${HOST_OBJCOPY_KERNEL_ARCH}"
KERNEL_STRIP:toolchain-clang = "llvm-strip"
+KERNEL_TOOLCHAIN ?= "gcc"
TOOLCHAIN = "gcc"
diff --git a/meta/classes-recipe/kernel.bbclass
b/meta/classes-recipe/kernel.bbclass
index 48e394b650..a90122354a 100644
--- a/meta/classes-recipe/kernel.bbclass
+++ b/meta/classes-recipe/kernel.bbclass
@@ -214,6 +214,7 @@ python do_symlink_kernsrc () {
addtask symlink_kernsrc before do_patch do_configure after do_unpack
inherit kernel-arch deploy
+TOOLCHAIN = "${KERNEL_TOOLCHAIN}"
PACKAGES_DYNAMIC += "^${KERNEL_PACKAGE_NAME}-module-.*"
PACKAGES_DYNAMIC += "^${KERNEL_PACKAGE_NAME}-image-.*"
diff --git a/meta/classes-recipe/module-base.bbclass
b/meta/classes-recipe/module-base.bbclass
index 2a225881ba..cae71a9b15 100644
--- a/meta/classes-recipe/module-base.bbclass
+++ b/meta/classes-recipe/module-base.bbclass
@@ -5,6 +5,7 @@
#
inherit kernel-arch
+TOOLCHAIN = "${KERNEL_TOOLCHAIN}"
# We do the dependency this way because the output is not preserved
# in sstate, so we must force do_compile to run (once).
diff --git a/meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb
b/meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb
index 338a50de91..d11afa86a1 100644
--- a/meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb
+++ b/meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb
@@ -4,6 +4,7 @@ LICENSE = "GPL-2.0-only"
LIC_FILES_CHKSUM =
"file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
inherit kernel-arch linux-kernel-base
+TOOLCHAIN = "${KERNEL_TOOLCHAIN}"
inherit pkgconfig
PACKAGE_ARCH = "${MACHINE_ARCH}"
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#241493):
https://lists.openembedded.org/g/openembedded-core/message/241493
Mute This Topic: https://lists.openembedded.org/mt/120368687/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
