From 912d9f531e69274d412372f200d0b5d56f8f268f Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Tue, 13 Jun 2017 03:26:17 -0400 Subject: [PATCH] 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 Signed-off-by: Ross Burton (cherry picked from commit 960652416e2390337df6d9734375d6829ceb6420) Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie --- meta/classes/kernel-yocto.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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