[oe-commits] [bitbake] 04/04: fixes

[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 949cea051a20c146ee932423b201a22ed88f6659
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Wed Jul 24 15:55:03 2019 +0100

    fixes
    
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 lib/bb/runqueue.py | 16 +++++++++++++---
 lib/bb/siggen.py   |  4 ++--
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py
index a04ec51..1dac538 100644
--- a/lib/bb/runqueue.py
+++ b/lib/bb/runqueue.py
@@ -1898,6 +1898,8 @@ class RunQueueExecute:
                 if dep not in self.runq_complete:
                     alldeps = False
                     break
+            if revdep in self.rqdata.runq_setscene_tids and revdep not in self.scenequeue_covered and revdep not in self.scenequeue_notcovered:
+                continue
             if alldeps:
                 self.setbuildable(revdep)
                 logger.debug(1, "Marking task %s as buildable", revdep)
@@ -2212,8 +2214,8 @@ class RunQueueExecute:
                     origuni = self.rqdata.runtaskentries[tid].unihash
                     self.rqdata.runtaskentries[tid].unihash = bb.parse.siggen.get_unihash(taskfn + "." + taskname)
                     logger.debug(1, "Task %s hash changes: %s->%s %s->%s" % (tid, orighash, self.rqdata.runtaskentries[tid].hash, origuni, self.rqdata.runtaskentries[tid].unihash))
-                    if str(origuni) == str(self.rqdata.runtaskentries[tid].unihash):
-                        bb.warn("Odd, has didn't change for %s?" % tid)
+#                    if str(origuni) == str(self.rqdata.runtaskentries[tid].unihash):
+#                        bb.warn("Odd, has didn't change for %s?" % tid)
                     next |= self.rqdata.runtaskentries[tid].revdeps
                     changed.add(tid)
                     total.remove(tid)
@@ -2239,7 +2241,7 @@ class RunQueueExecute:
             self.update_holdofftasks()
 
     def update_holdofftasks(self):
-        self.holdoff_tasks = set()
+        self.holdoff_tasks = set(self.changed_setscene)
         for tid in self.changed_setscene.copy():
             for dep in self.sqdata.sq_covered_tasks[tid]:
                 if dep not in self.runq_complete:
@@ -2249,6 +2251,10 @@ class RunQueueExecute:
     def process_possible_migrations(self):
         changes = False
         for tid in self.changed_setscene.copy():
+            if tid in self.runq_running:
+                self.changed_setscene.remove(tid)
+                continue
+
             valid = True
             # Check no tasks this covers are running
             for dep in self.sqdata.sq_covered_tasks[tid]:
@@ -2259,6 +2265,10 @@ class RunQueueExecute:
             if not valid:
                 continue
 
+            if tid in self.runq_buildable:
+                self.runq_buildable.remove(tid)
+                self.sched.removebuildable(tid)
+
             for dep in self.sqdata.sq_covered_tasks[tid]:
                 if dep in self.runq_buildable and dep not in self.runq_complete:
                     self.runq_buildable.remove(dep)
diff --git a/lib/bb/siggen.py b/lib/bb/siggen.py
index 4b02a27..6cbb2fb 100644
--- a/lib/bb/siggen.py
+++ b/lib/bb/siggen.py
@@ -83,10 +83,10 @@ class SignatureGenerator(object):
         self.__init__(data)
 
     def get_taskhashes(self):
-        return self.taskhash
+        return self.taskhash, self.unitaskhashes
 
     def set_taskhashes(self, hashes):
-        self.taskhash = hashes
+        self.taskhash, self.unitaskhashes = hashes
 
     def save_unitaskhashes(self):
         return

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