[gnome-continuous-yocto/gnomeostree-3.28-rocko: 3106/8267] test-dependencies.sh: Strip also '\.bb: .*' before adding failed recipe to list of failed



commit d7affc5dfa6bd802620fbc1b3cbd7e49c119b876
Author: Martin Jansa <martin jansa gmail com>
Date:   Wed Oct 19 17:31:56 2016 +0200

    test-dependencies.sh: Strip also '\.bb: .*' before adding failed recipe to list of failed
    
    * format of bitbake tasks changed in:
      2c88afb   taskdata/runqueue: Rewrite without use of ID indirection
    
    -ERROR: Task 4 (/OE/build/oe-core/openembedded-core/meta/recipes-devtools/rpm/sftp.bb, do_fetch) failed 
with exit code '1'
    +ERROR: Task /OE/build/oe-core/openembedded-core/meta/recipes-devtools/rpm/sftp.bb:do_fetch 
(/OE/build/oe-core/openembedded-core/meta/recipes-devtools/rpm/sftp.bb:do_fetch) failed with exit code '1'
    
      so strip not only '\.bb, .*' used before, but also '\.bb:.*' to drop
      the task name to get recipe name.
    
    * for more details see:
      http://lists.openembedded.org/pipermail/openembedded-core/2016-June/123132.html
    
    * without this change you can see test-dependencies.sh trying to rebuild packages
      like:
      Building recipe: fbprogress (6/21)
      Building recipe: fbprogress.bb:do (7/21)
      where the later of course doesn't exist as a recipe
    
    (From OE-Core rev: 26ed215c30c183a3814889c145670220fd3b8bfa)
    
    Signed-off-by: Martin Jansa <Martin Jansa gmail com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/test-dependencies.sh |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/scripts/test-dependencies.sh b/scripts/test-dependencies.sh
index 00c50e0..0b94de8 100755
--- a/scripts/test-dependencies.sh
+++ b/scripts/test-dependencies.sh
@@ -141,7 +141,7 @@ build_all() {
   bitbake -k $targets 2>&1 | tee -a ${OUTPUT1}/complete.log
   RESULT+=${PIPESTATUS[0]}
   grep "ERROR: Task.*failed" ${OUTPUT1}/complete.log > ${OUTPUT1}/failed-tasks.log
-  cat ${OUTPUT1}/failed-tasks.log | sed 's@.*/@@g; s@_.*@@g; s@\.bb, .*@@g; s@\.bb;.*@@g' | sort -u > 
${OUTPUT1}/failed-recipes.log
+  cat ${OUTPUT1}/failed-tasks.log | sed 's@.*/@@g; s@_.*@@g; s@\.bb, .*@@g; s@\.bb:.*@@g' | sort -u > 
${OUTPUT1}/failed-recipes.log
 }
 
 build_every_recipe() {
@@ -178,7 +178,7 @@ build_every_recipe() {
       RESULT+=${RECIPE_RESULT}
       mv ${OUTPUTB}/${recipe}.log ${OUTPUTB}/failed/
       grep "ERROR: Task.*failed"  ${OUTPUTB}/failed/${recipe}.log | tee -a ${OUTPUTB}/failed-tasks.log
-      grep "ERROR: Task.*failed"  ${OUTPUTB}/failed/${recipe}.log | sed 's@.*/@@g; s@_.*@@g; s@\.bb, .*@@g; 
s@\.bb;.*@@g' >> ${OUTPUTB}/failed-recipes.log
+      grep "ERROR: Task.*failed"  ${OUTPUTB}/failed/${recipe}.log | sed 's@.*/@@g; s@_.*@@g; s@\.bb, .*@@g; 
s@\.bb:.*@@g' >> ${OUTPUTB}/failed-recipes.log
       # and append also ${recipe} in case the failed task was from some dependency
       echo ${recipe} >> ${OUTPUTB}/failed-recipes.log
     else


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