[gnome-continuous-yocto/gnomeostree-3.28-rocko: 6773/8267] kernel-yocto: propagate configuration errors to bbclass



commit aa7fc34dc4c07c3e22539249999282dd6b3cf1e6
Author: Bruce Ashfield <bruce ashfield windriver com>
Date:   Tue Jun 13 03:26:17 2017 -0400

    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: 960652416e2390337df6d9734375d6829ceb6420)
    
    Signed-off-by: Bruce Ashfield <bruce ashfield windriver com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/kernel-yocto.bbclass |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 50226f6..1ca0756 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
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]