summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2020-02-07 09:52:04 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-02-08 13:20:02 +0000
commit6113de76c88206be1bab5a066b1b90f811e39de2 (patch)
tree2e2695a7bcf7706ff519264c244a244389b7785e
parentcc71bb7b73fed2ea0e531b99ae955099973a3aac (diff)
downloadpoky-6113de76c88206be1bab5a066b1b90f811e39de2.tar.gz
kern-tools: fix merge_config when LD contains parameters
To ensure that the kernel linker is used when allno/mod/yes config merge_config steps were executed, the call to make was tweaked to explicitly pass LD. But since the variable wasn't quoted, any parameters to LD (like the sysroot) were mistakenly passed to make, and hence could trigger an error on some architectures. We also tweak the logging to hightlight errors like this in the future and avoid losing it in the noise of merge configs sometimes overly verbose output. (From OE-Core rev: a60c4c116efecd7a6ee5a11b1d366bb00b9d23ce) Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/kernel-yocto.bbclass10
-rw-r--r--meta/recipes-kernel/kern-tools/kern-tools-native_git.bb2
2 files changed, 8 insertions, 4 deletions
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 918d101d3d..44863adc27 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -352,10 +352,14 @@ do_kernel_configme() {
352 bbfatal_log "Could not find configuration queue (${meta_dir}/config.queue)" 352 bbfatal_log "Could not find configuration queue (${meta_dir}/config.queue)"
353 fi 353 fi
354 354
355 CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} 355 CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} > ${meta_dir}/cfg/merge_config_build.log 2>&1
356
357 if [ $? -ne 0 -o ! -f ${B}/.config ]; then 356 if [ $? -ne 0 -o ! -f ${B}/.config ]; then
358 bbfatal_log "Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}" 357 bberror "Could not generate a .config for ${KMACHINE}-${LINUX_KERNEL_TYPE}"
358 if [ ${KCONF_AUDIT_LEVEL} -gt 1 ]; then
359 bbfatal_log "`cat ${meta_dir}/cfg/merge_config_build.log`"
360 else
361 bbfatal_log "Details can be found at: ${S}/${meta_dir}/cfg/merge_config_build.log"
362 fi
359 fi 363 fi
360 364
361 if [ ! -z "${LINUX_VERSION_EXTENSION}" ]; then 365 if [ ! -z "${LINUX_VERSION_EXTENSION}" ]; then
diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
index f263421234..4f1af731d6 100644
--- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
+++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://tools/kgit;beginline=5;endline=9;md5=9c30e971d435e249
4 4
5DEPENDS = "git-native" 5DEPENDS = "git-native"
6 6
7SRCREV = "388b67974deb2176c06994a325676cbf23e5fce8" 7SRCREV = "c66833e1caac25279a5052fceb13213f5e4f79f9"
8PR = "r12" 8PR = "r12"
9PV = "0.2+git${SRCPV}" 9PV = "0.2+git${SRCPV}"
10 10