mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 00:20:08 +00:00
Code Issues Projects Releases Wiki Activity

kernel: Always set CC and LD for the kernel build

Browse Source 
It as been bothering me a bit that we don't set CC and LD consistently
for the kernel make calls and this can lead to interesting bugs as the
kernel increases in complexity. Add them to EXTRA_OEMAKE so they're
always passed in. This makes everything slightly more consistent and
less likely to break in future.

(From OE-Core rev: afe8c318843e4033dcc07e4f10198df241d8e4f6)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2022-09-02 15:12:41 +00:00
parent af03e80436
commit 36035d2eb0
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes-recipe/kernel.bbclass
+7 -6
View File
@@ -237,8 +237,9 @@ UBOOT_LOADADDRESS ?= "${UBOOT_ENTRYPOINT}"
# Some Linux kernel configurations need additional parameters on the command line # Some Linux kernel configurations need additional parameters on the command line
KERNEL_EXTRA_ARGS ?= "" KERNEL_EXTRA_ARGS ?= ""
EXTRA_OEMAKE = " HOSTCC="${BUILD_CC}" HOSTCFLAGS="${BUILD_CFLAGS}" HOSTLDFLAGS="${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}"" EXTRA_OEMAKE += ' CC="${KERNEL_CC}" LD="${KERNEL_LD}"'
EXTRA_OEMAKE += " HOSTCXX="${BUILD_CXX}" HOSTCXXFLAGS="${BUILD_CXXFLAGS}" PAHOLE=false" EXTRA_OEMAKE += ' HOSTCC="${BUILD_CC}" HOSTCFLAGS="${BUILD_CFLAGS}" HOSTLDFLAGS="${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}"'
EXTRA_OEMAKE += ' HOSTCXX="${BUILD_CXX}" HOSTCXXFLAGS="${BUILD_CXXFLAGS}" PAHOLE=false'
KERNEL_ALT_IMAGETYPE ??= "" KERNEL_ALT_IMAGETYPE ??= ""
@@ -381,7 +382,7 @@ kernel_do_compile() {
use_alternate_initrd=CONFIG_INITRAMFS_SOURCE=${B}/usr/${INITRAMFS_IMAGE_NAME}.cpio use_alternate_initrd=CONFIG_INITRAMFS_SOURCE=${B}/usr/${INITRAMFS_IMAGE_NAME}.cpio
fi fi
for typeformake in ${KERNEL_IMAGETYPE_FOR_MAKE} ; do for typeformake in ${KERNEL_IMAGETYPE_FOR_MAKE} ; do
oe_runmake ${typeformake} CC="${KERNEL_CC}" LD="${KERNEL_LD}" ${KERNEL_EXTRA_ARGS} $use_alternate_initrd oe_runmake ${typeformake} ${KERNEL_EXTRA_ARGS} $use_alternate_initrd
done done
} }
@@ -413,7 +414,7 @@ do_compile_kernelmodules() {
bbnote "KBUILD_BUILD_TIMESTAMP: $ts" bbnote "KBUILD_BUILD_TIMESTAMP: $ts"
fi fi
if (grep -q -i -e '^CONFIG_MODULES=y$' ${B}/.config); then if (grep -q -i -e '^CONFIG_MODULES=y$' ${B}/.config); then
oe_runmake -C ${B} ${PARALLEL_MAKE} modules CC="${KERNEL_CC}" LD="${KERNEL_LD}" ${KERNEL_EXTRA_ARGS} oe_runmake -C ${B} ${PARALLEL_MAKE} modules ${KERNEL_EXTRA_ARGS}
# Module.symvers gets updated during the # Module.symvers gets updated during the
# building of the kernel modules. We need to # building of the kernel modules. We need to
@@ -597,7 +598,7 @@ sysroot_stage_all () {
: :
} }
KERNEL_CONFIG_COMMAND ?= "oe_runmake_call -C ${S} CC="${KERNEL_CC}" LD="${KERNEL_LD}" O=${B} olddefconfig || oe_runmake -C ${S} O=${B} CC="${KERNEL_CC}" LD="${KERNEL_LD}" oldnoconfig" KERNEL_CONFIG_COMMAND ?= "oe_runmake_call -C ${S} O=${B} olddefconfig || oe_runmake -C ${S} O=${B} oldnoconfig"
python check_oldest_kernel() { python check_oldest_kernel() {
oldest_kernel = d.getVar('OLDEST_KERNEL') oldest_kernel = d.getVar('OLDEST_KERNEL')
@@ -635,7 +636,7 @@ kernel_do_configure() {
do_savedefconfig() { do_savedefconfig() {
bbplain "Saving defconfig to:\n${B}/defconfig" bbplain "Saving defconfig to:\n${B}/defconfig"
oe_runmake -C ${B} LD='${KERNEL_LD}' savedefconfig oe_runmake -C ${B} savedefconfig
} }
do_savedefconfig[nostamp] = "1" do_savedefconfig[nostamp] = "1"
addtask savedefconfig after do_configure addtask savedefconfig after do_configure