aboutsummaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2017-06-13 03:26:17 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-07-27 22:35:12 +0100
commit3470a3839577b99322c10f830cdaa61128ef6b16 (patch)
tree98b59ee76a29c543a0fa15ce4e865d6232ad0f04 /meta/classes
parente3c832e49a9596537198a46075ed3d6794639953 (diff)
downloadopenembedded-core-contrib-3470a3839577b99322c10f830cdaa61128ef6b16.tar.gz
kernel-yocto: propagate configuration errors to bbclass
As pointed out by klapperichpaul@johndeere.com, missing configuration fragments were being picked up twice, once by the tools and once by the bbclass. Unfortunately, the tools error message was being detected as configs, and hence no error was reported at all. Rather than catching the output of the tools, we can instead check the return code and propagate the error message from the tools directly to the user. [YOCTO #11649] Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> (cherry picked from commit 960652416e2390337df6d9734375d6829ceb6420) Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/kernel-yocto.bbclass3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 50226f6d49..1ca0756c49 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -281,7 +281,8 @@ do_kernel_configme() {
meta_dir=$(kgit --meta)
configs="$(scc --configs -o ${meta_dir})"
- if [ -z "${configs}" ]; then
+ if [ $? -ne 0 ]; then
+ bberror "${configs}"
bbfatal_log "Could not find configuration queue (${meta_dir}/config.queue)"
fi