diff options
Diffstat (limited to 'bitbake/lib/bb/runqueue.py')
| -rw-r--r-- | bitbake/lib/bb/runqueue.py | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index 48b668abc1..103d42df2b 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py | |||
| @@ -2443,29 +2443,29 @@ def build_scenequeue_data(sqdata, rqdata, rq, cooker, stampcache, sqrq): | |||
| 2443 | # e.g. do_sometask_setscene[depends] = "targetname:do_someothertask_setscene" | 2443 | # e.g. do_sometask_setscene[depends] = "targetname:do_someothertask_setscene" |
| 2444 | # Note that anything explicitly depended upon will have its reverse dependencies removed to avoid circular dependencies | 2444 | # Note that anything explicitly depended upon will have its reverse dependencies removed to avoid circular dependencies |
| 2445 | for tid in rqdata.runq_setscene_tids: | 2445 | for tid in rqdata.runq_setscene_tids: |
| 2446 | (mc, fn, taskname, taskfn) = split_tid_mcfn(tid) | 2446 | (mc, fn, taskname, taskfn) = split_tid_mcfn(tid) |
| 2447 | realtid = tid + "_setscene" | 2447 | realtid = tid + "_setscene" |
| 2448 | idepends = rqdata.taskData[mc].taskentries[realtid].idepends | 2448 | idepends = rqdata.taskData[mc].taskentries[realtid].idepends |
| 2449 | sqdata.stamps[tid] = bb.build.stampfile(taskname + "_setscene", rqdata.dataCaches[mc], taskfn, noextra=True) | 2449 | sqdata.stamps[tid] = bb.build.stampfile(taskname + "_setscene", rqdata.dataCaches[mc], taskfn, noextra=True) |
| 2450 | for (depname, idependtask) in idepends: | 2450 | for (depname, idependtask) in idepends: |
| 2451 | 2451 | ||
| 2452 | if depname not in rqdata.taskData[mc].build_targets: | 2452 | if depname not in rqdata.taskData[mc].build_targets: |
| 2453 | continue | 2453 | continue |
| 2454 | 2454 | ||
| 2455 | depfn = rqdata.taskData[mc].build_targets[depname][0] | 2455 | depfn = rqdata.taskData[mc].build_targets[depname][0] |
| 2456 | if depfn is None: | 2456 | if depfn is None: |
| 2457 | continue | 2457 | continue |
| 2458 | deptid = depfn + ":" + idependtask.replace("_setscene", "") | 2458 | deptid = depfn + ":" + idependtask.replace("_setscene", "") |
| 2459 | if deptid not in rqdata.runtaskentries: | 2459 | if deptid not in rqdata.runtaskentries: |
| 2460 | bb.msg.fatal("RunQueue", "Task %s depends upon non-existent task %s:%s" % (realtid, depfn, idependtask)) | 2460 | bb.msg.fatal("RunQueue", "Task %s depends upon non-existent task %s:%s" % (realtid, depfn, idependtask)) |
| 2461 | 2461 | ||
| 2462 | if not deptid in sqdata.sq_harddeps: | 2462 | if not deptid in sqdata.sq_harddeps: |
| 2463 | sqdata.sq_harddeps[deptid] = set() | 2463 | sqdata.sq_harddeps[deptid] = set() |
| 2464 | sqdata.sq_harddeps[deptid].add(tid) | 2464 | sqdata.sq_harddeps[deptid].add(tid) |
| 2465 | 2465 | ||
| 2466 | sq_revdeps_squash[tid].add(deptid) | 2466 | sq_revdeps_squash[tid].add(deptid) |
| 2467 | # Have to zero this to avoid circular dependencies | 2467 | # Have to zero this to avoid circular dependencies |
| 2468 | sq_revdeps_squash[deptid] = set() | 2468 | sq_revdeps_squash[deptid] = set() |
| 2469 | 2469 | ||
| 2470 | rqdata.init_progress_reporter.next_stage() | 2470 | rqdata.init_progress_reporter.next_stage() |
| 2471 | 2471 | ||
