summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/runqueue.py
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-27 13:07:24 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-28 15:12:45 +0100
commitd1a133a6705d3bad97cf7b9e26441970d24ed97e (patch)
treec4de856249259a9e4b55cf53b189ff874066402f /bitbake/lib/bb/runqueue.py
parent859ad9402c25ed6ad34938ddb9deff706dfd81c2 (diff)
downloadpoky-d1a133a6705d3bad97cf7b9e26441970d24ed97e.tar.gz
bitbake: runqueue: Fix setscene tasks not running
Currently, if you have hard dependencies between setscene tasks (like avahi on base-passwd through useradd.bbclass), other dependencies may not be installed even if these exist in sstate. For example, avahi -> expat -> pigz-native (and avahi -> base-passwd) yet if you cleansstate base-passwd: bitbake gzip-native:do_clean avahi:do_clean expat:do_clean pigz-native:do_clean base-passwd:do_cleansstate bitbake avahi | tee you will currently see pigz-native being rebuilt even though it was in sstate. The fix for this is to continue to iterate dependency chains around hard blocked dependencies as per this patch. After this patch is applied, you will see pigz-native installed from sstate. (Bitbake rev: f787957a224e8c2682a19e5c4a4d9c86bdce52ba) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/runqueue.py')
-rw-r--r--bitbake/lib/bb/runqueue.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py
index e13dc57ae8..e32f81a165 100644
--- a/bitbake/lib/bb/runqueue.py
+++ b/bitbake/lib/bb/runqueue.py
@@ -1844,6 +1844,10 @@ class RunQueueExecuteScenequeue(RunQueueExecute):
1844 realtask = self.rqdata.runq_setscene[task] 1844 realtask = self.rqdata.runq_setscene[task]
1845 realdep = self.rqdata.runq_setscene[dep] 1845 realdep = self.rqdata.runq_setscene[dep]
1846 logger.debug(2, "%s was unavailable and is a hard dependency of %s so skipping" % (self.rqdata.get_user_idstring(realtask), self.rqdata.get_user_idstring(realdep))) 1846 logger.debug(2, "%s was unavailable and is a hard dependency of %s so skipping" % (self.rqdata.get_user_idstring(realtask), self.rqdata.get_user_idstring(realdep)))
1847 self.scenequeue_updatecounters(dep, fail)
1848 continue
1849 if task not in self.sq_revdeps2[dep]:
1850 # May already have been removed by the fail case above
1847 continue 1851 continue
1848 self.sq_revdeps2[dep].remove(task) 1852 self.sq_revdeps2[dep].remove(task)
1849 if len(self.sq_revdeps2[dep]) == 0: 1853 if len(self.sq_revdeps2[dep]) == 0: