[gnome-continuous-yocto/gnomeostree-3.28-rocko: 2261/8267] kernel-yocto: test for empty artifacts



commit 5ea48fa5ee1201e17bac7e9cf6d48c3795216911
Author: Bruce Ashfield <bruce ashfield windriver com>
Date:   Tue Aug 30 12:49:05 2016 -0400

    kernel-yocto: test for empty artifacts
    
    With the updated kernel tools, we generate a list of sccs, patches,
    configs and BSP definitions as part of the meta data generation.
    
    It is valid if there aren't any of these artifacts found (i.e. you
    are just building a branch and a default config), but invoking the
    tools with no inputs isn't a good idea.
    
    To avoid this issue, we generate a string based on the artifacts
    and skip calling the tools if there's nothing to do.
    
    (From OE-Core rev: 58715183493de1deb90f2ab075048462b4bf6c73)
    
    Signed-off-by: Bruce Ashfield <bruce ashfield windriver com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/kernel-yocto.bbclass |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 8650e55..9b8bab6 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -139,10 +139,16 @@ do_kernel_metadata() {
        meta_dir=$(kgit --meta)
 
        # run1: pull all the configuration fragments, no matter where they come from
-       scc --force -o ${S}/${meta_dir}:cfg,meta ${includes} ${bsp_definition} ${sccs} ${patches} 
${KERNEL_FEATURES}
+       elements="`echo -n ${bsp_definition} ${sccs} ${patches} ${KERNEL_FEATURES}`"
+       if [ -n "${elements}" ]; then
+               scc --force -o ${S}/${meta_dir}:cfg,meta ${includes} ${bsp_definition} ${sccs} ${patches} 
${KERNEL_FEATURES}
+       fi
 
        # run2: only generate patches for elements that have been passed on the SRC_URI
-       scc --force -o ${S}/${meta_dir}:patch --cmds patch ${includes} ${sccs} ${patches} ${KERNEL_FEATURES}
+       elements="`echo -n ${sccs} ${patches} ${KERNEL_FEATURES}`"
+       if [ -n "${elements}" ]; then
+               scc --force -o ${S}/${meta_dir}:patch --cmds patch ${includes} ${sccs} ${patches} 
${KERNEL_FEATURES}
+       fi
 }
 
 do_patch() {


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