Skip to contentSkip to conversation

kernel-arch: limit KERNEL_TOOLCHAIN to the kbuild recipes

PATCH Superseded [email protected] 1 participant 1 message Jul 24

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kernel-arch: limit KERNEL_TOOLCHAIN to the kbuild recipes

From: "mark.yang" <[email protected]>

u-boot and barebox inherit kernel-arch for the ARCH mapping, so since 0e3756efe0 ("kernel-arch: add KERNEL_TOOLCHAIN to switch the whole kernel toolchain") KERNEL_TOOLCHAIN = "clang" switches them too. That swaps u-boot's gcc-cross dependency for clang-cross, but its kbuild hardcodes ${CROSS_COMPILE}gcc:

/bin/sh: 1: x86_64-oe-linux-gcc: not found

Full log: https://errors.yoctoproject.org/Errors/Build/242654/

Pin TOOLCHAIN back to gcc in kernel-arch and set it from KERNEL_TOOLCHAIN in kernel.bbclass, module-base and make-mod-scripts.

---
The v2 series was merged, so this carries the remaining v3 3/3 delta (<[email protected]>) as a follow-up fix.

 meta/classes-recipe/kernel-arch.bbclass                      | 2 +-
 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(+), 1 deletion(-)
meta/classes-recipe/kernel-arch.bbclass +1 -1
index 5f8dbacc0c..b15e0aca80 100644
@@ -93,4 +93,4 @@ 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 = "${KERNEL_TOOLCHAIN}"
+TOOLCHAIN = "gcc"
meta/classes-recipe/kernel.bbclass +1 -0
index 91248467be..619359fb7d 100644
@@ -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-.*"
meta/classes-recipe/module-base.bbclass +1 -0
index 2a225881ba..cae71a9b15 100644
@@ -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).
meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb +1 -0
index 338a50de91..d11afa86a1 100644
@@ -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}"