summaryrefslogtreecommitdiffstats
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:36:45 +0100
commit912d9f531e69274d412372f200d0b5d56f8f268f (patch)
tree45dd4566d0dd87bc8fb0f8ac33cbffccf499b4a5 /meta/classes
parent0ffe27ffef5d58be47a0affea8a7cda67f8d0f92 (diff)
downloadpoky-912d9f531e69274d412372f200d0b5d56f8f268f.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] (From OE-Core rev: 3470a3839577b99322c10f830cdaa61128ef6b16) 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> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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() {
281 281
282 meta_dir=$(kgit --meta) 282 meta_dir=$(kgit --meta)
283 configs="$(scc --configs -o ${meta_dir})" 283 configs="$(scc --configs -o ${meta_dir})"
284 if [ -z "${configs}" ]; then 284 if [ $? -ne 0 ]; then
285 bberror "${configs}"
285 bbfatal_log "Could not find configuration queue (${meta_dir}/config.queue)" 286 bbfatal_log "Could not find configuration queue (${meta_dir}/config.queue)"
286 fi 287 fi
287 288