[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4686/8267] bitbake: runqueue: Fix collapsed setscene dependency tree

[Emmanuele Bassi <ebassi src gnome org>]

commit ff734f0560649c0d8743aa1ebdaef8cfb20e6628
Author: Richard Purdie <richard purdie linuxfoundation org>
Date:   Sat Feb 18 13:09:39 2017 -0800

    bitbake: runqueue: Fix collapsed setscene dependency tree
    
    When we removed the postinst sstate dependency handling code from
    setscene_depvalid, we noticed things being installed into the old
    style sysroot for rootfs tasks which should not have been there,
    causing a performance regression.
    
    Analysis revealed that setscene dependencies were "bubbling" over
    sstate tasks when they should have been stopping there. The
    'continue' added by this patch avoids this issue and eusures
    sstate tasks remain contained to their specific chains.
    
    There was another bug in the code this exposed where the acconting
    for tasks as they were removed from sq_revdeps was not correct. In
    fixing this, what looks like a workaround in another test can then
    be simplified.
    
    After this change, populate_sysroot tasks are no longer depending
    on package_write_rpm tasks for example, which would make no sense.
    
    A before/after analysis of image dependencies only revealed improved
    dependencies after this change.
    
    Recipe specific sysroots did highlight the issue here since the
    behaviour of the sysroot dependencies (and processing with depvalid)
    was not matching what bitbake itself was doing, with bitbake being
    incorrect. Failures were 'safe' in that too many dependencies would
    get installed.
    
    (Bitbake rev: 5ef2cb50041fa7106c8de170af73d2a54cb0b1f0)
    
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 bitbake/lib/bb/runqueue.py |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py
index 728b5fb..a3b451a 100644
--- a/bitbake/lib/bb/runqueue.py
+++ b/bitbake/lib/bb/runqueue.py
@@ -2010,6 +2010,8 @@ class RunQueueExecuteScenequeue(RunQueueExecute):
         for tid in self.rqdata.runq_setscene_tids:
             #bb.warn("Added endpoint 2 %s" % (tid))
             for dep in self.rqdata.runtaskentries[tid].depends:
+                    if tid in sq_revdeps[dep]:
+                        sq_revdeps[dep].remove(tid)
                     if dep not in endpoints:
                         endpoints[dep] = set()
                     #bb.warn("  Added endpoint 3 %s" % (dep))
@@ -2029,12 +2031,13 @@ class RunQueueExecuteScenequeue(RunQueueExecute):
                 if point in self.rqdata.runq_setscene_tids:
                     sq_revdeps_new[point] = tasks
                     tasks = set()
+                    continue
                 for dep in self.rqdata.runtaskentries[point].depends:
                     if point in sq_revdeps[dep]:
                         sq_revdeps[dep].remove(point)
                     if tasks:
                         sq_revdeps_new[dep] |= tasks
-                    if (len(sq_revdeps[dep]) == 0 or len(sq_revdeps_new[dep]) != 0) and dep not in 
self.rqdata.runq_setscene_tids:
+                    if len(sq_revdeps[dep]) == 0 and dep not in self.rqdata.runq_setscene_tids:
                         newendpoints[dep] = task
             if len(newendpoints) != 0:
                 process_endpoints(newendpoints)