[oe-commits] [bitbake] 01/01: runqueue: Ensure setscene tasks that aren't covered get built

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository bitbake.

commit 2713db939d654fa0b3395e2f8b42bf516ea41439
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Fri Sep 7 17:41:27 2018 +0100

    runqueue: Ensure setscene tasks that aren't covered get built
    
    Running "bitbake gconf-native -c cleansstate; bitbake core-image-sato:do_populate_sdk"
    
    results in a build where it fails to find gconf-native and fails to build it,
    merrily trying to build the SDK without gconf being present.
    
    The issue is the missing setscene tasks are effectively ignored as the later
    code in runqueue thinks that since other sstate tasks are present, these
    'cover' the missing one. In reality we need to call BB_SETSCENE_DEPVALID
    to make that decision. To do that we need a "reduced" setscene dependency
    graph which we don't have in main task graph context.
    
    Since that was already done in setscene, we should just assume anything
    in the non-covered list needs to be built.
    
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 lib/bb/runqueue.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py
index 91911af..b6903fd 100644
--- a/lib/bb/runqueue.py
+++ b/lib/bb/runqueue.py
@@ -1831,7 +1831,7 @@ class RunQueueExecuteTasks(RunQueueExecute):
             bb.build.del_stamp(taskname, self.rqdata.dataCaches[mc], taskfn)
             self.rq.scenequeue_covered.remove(tid)
 
-        toremove = covered_remove
+        toremove = covered_remove | self.rq.scenequeue_notcovered
         for task in toremove:
             logger.debug(1, 'Not skipping task %s due to setsceneverify', task)
         while toremove:
@@ -2103,6 +2103,7 @@ class RunQueueExecuteScenequeue(RunQueueExecute):
         # If we don't have any setscene functions, skip this step
         if len(self.rqdata.runq_setscene_tids) == 0:
             rq.scenequeue_covered = set()
+            rq.scenequeue_notcovered = set()
             rq.state = runQueueRunInit
             return
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.