summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2018-02-27 13:44:17 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-01 22:14:12 +0000
commit4bc71faf767539b9b6528bd37ef63d07d6f562c2 (patch)
tree63dadca85926bcbf986c42d3614e5569266a2d5b
parent4604ab6198ab409f6939e3964540883c7918b464 (diff)
downloadpoky-4bc71faf767539b9b6528bd37ef63d07d6f562c2.tar.gz
bitbake: runqueue: Ensure only recursive task dependencies are pruned
If a standalone tasks adds a dependency on X:do_build, the code in runqueue would currently remove it if that do_build was part of an image recipe which uses recrdeptask on do_build. Such individual tasks shouldn't do this, therefore tweak the recursive reference code to only process recurseive tasks, not all tasks. (Bitbake rev: 4cfca360891e1ed876a9c19487b4f6210686af26) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/runqueue.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py
index 48df013155..f2e52cf758 100644
--- a/bitbake/lib/bb/runqueue.py
+++ b/bitbake/lib/bb/runqueue.py
@@ -765,7 +765,7 @@ class RunQueueData:
765 bb.debug(1, "Added %s recursive dependencies in this loop" % extradeps) 765 bb.debug(1, "Added %s recursive dependencies in this loop" % extradeps)
766 766
767 # Remove recrdeptask circular references so that do_a[recrdeptask] = "do_a do_b" can work 767 # Remove recrdeptask circular references so that do_a[recrdeptask] = "do_a do_b" can work
768 for tid in self.runtaskentries: 768 for tid in recursivetasksselfref:
769 self.runtaskentries[tid].depends.difference_update(recursivetasksselfref) 769 self.runtaskentries[tid].depends.difference_update(recursivetasksselfref)
770 770
771 self.init_progress_reporter.next_stage() 771 self.init_progress_reporter.next_stage()