[oe-commits] [bitbake] branch master-next updated: runqueue: Handle missing sstate dependencies better

[git at git.openembedded.org]

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

The following commit(s) were added to refs/heads/master-next by this push:
       new  ba566b4   runqueue: Handle missing sstate dependencies better
ba566b4 is described below

commit ba566b46d530b495f12f3a74f76434717b22a020
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Tue Sep 20 16:25:49 2016 +0100

    runqueue: Handle missing sstate dependencies better
    
    If you "bitbake glibc-locale" then delete the libpcre-native sstate
    and "bitbake glibc-locale -C package_write_rpm", it will fail with
    rpmbuild missing the libprce library.
    
    The reason is that libpcre-native fails to install from sstate (since
    it isn't present) but doesn't get built and hence rpm-native tries to
    run without its dependencies.
    
    The simplest fix is not to add "covered" tasks which have failed to
    install sstate. I can't help feeling there is more to this issue but
    this does fix the current problem and shouldn't have adverse affects.
    It is an unusual situation to have missing dependencies in sstate since
    they're usually all present or not at all.
    
    I've taken the opportunity to remove some old cruft from when we had
    numeric task ids, the code can be simpler now.
    
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 lib/bb/runqueue.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py
index e4c9737..9b7bb3f 100644
--- a/lib/bb/runqueue.py
+++ b/lib/bb/runqueue.py
@@ -1555,6 +1555,8 @@ class RunQueueExecuteTasks(RunQueueExecute):
                 logger.debug(1, 'Considering %s: %s' % (tid, str(self.rqdata.runtaskentries[tid].revdeps)))
 
                 if len(self.rqdata.runtaskentries[tid].revdeps) > 0 and self.rqdata.runtaskentries[tid].revdeps.issubset(self.rq.scenequeue_covered):
+                    if tid in self.rq.scenequeue_notcovered:
+                        continue
                     found = True
                     self.rq.scenequeue_covered.add(tid)
 
@@ -2229,11 +2231,8 @@ class RunQueueExecuteScenequeue(RunQueueExecute):
         #        revdeps = self.sq_revdeps[tid]
         #        bb.warn("Found we didn't run %s %s %s" % (tid, buildable, str(revdeps)))
 
-        # Convert scenequeue_covered task numbers into full taskgraph ids
-        oldcovered = self.scenequeue_covered
-        self.rq.scenequeue_covered = set()
-        for task in oldcovered:
-            self.rq.scenequeue_covered.add(task)
+        self.rq.scenequeue_covered = self.scenequeue_covered
+        self.rq.scenequeue_notcovered = self.scenequeue_notcovered
 
         logger.debug(1, 'We can skip tasks %s', sorted(self.rq.scenequeue_covered))
 

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