summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-20 16:25:49 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-21 21:58:06 +0100
commitd3e6e1054c148983370febdab362628d9854bc24 (patch)
tree17dcb1a0ee07afbecbb750b6659895cedbb16f29
parenta884c4307a702da15af4aa6c1f8b8314cdb0ed08 (diff)
downloadpoky-d3e6e1054c148983370febdab362628d9854bc24.tar.gz
bitbake: runqueue: Handle missing sstate dependencies better
If you "bitbake glibc-locale" then delete the libpcre-native sstate and "bitbake glibc-locale -C package_write_rpm", it will fail with rpmbuild missing the libprce library. The reason is that libpcre-native fails to install from sstate (since it isn't present) but doesn't get built and hence rpm-native tries to run without its dependencies. The simplest fix is not to add "covered" tasks which have failed to install sstate. I can't help feeling there is more to this issue but this does fix the current problem and shouldn't have adverse affects. It is an unusual situation to have missing dependencies in sstate since they're usually all present or not at all. I've taken the opportunity to remove some old cruft from when we had numeric task ids, the code can be simpler now. (Bitbake rev: ba566b46d530b495f12f3a74f76434717b22a020) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/runqueue.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py
index e4c97379af..9b7bb3fe93 100644
--- a/bitbake/lib/bb/runqueue.py
+++ b/bitbake/lib/bb/runqueue.py
@@ -1555,6 +1555,8 @@ class RunQueueExecuteTasks(RunQueueExecute):
1555 logger.debug(1, 'Considering %s: %s' % (tid, str(self.rqdata.runtaskentries[tid].revdeps))) 1555 logger.debug(1, 'Considering %s: %s' % (tid, str(self.rqdata.runtaskentries[tid].revdeps)))
1556 1556
1557 if len(self.rqdata.runtaskentries[tid].revdeps) > 0 and self.rqdata.runtaskentries[tid].revdeps.issubset(self.rq.scenequeue_covered): 1557 if len(self.rqdata.runtaskentries[tid].revdeps) > 0 and self.rqdata.runtaskentries[tid].revdeps.issubset(self.rq.scenequeue_covered):
1558 if tid in self.rq.scenequeue_notcovered:
1559 continue
1558 found = True 1560 found = True
1559 self.rq.scenequeue_covered.add(tid) 1561 self.rq.scenequeue_covered.add(tid)
1560 1562
@@ -2229,11 +2231,8 @@ class RunQueueExecuteScenequeue(RunQueueExecute):
2229 # revdeps = self.sq_revdeps[tid] 2231 # revdeps = self.sq_revdeps[tid]
2230 # bb.warn("Found we didn't run %s %s %s" % (tid, buildable, str(revdeps))) 2232 # bb.warn("Found we didn't run %s %s %s" % (tid, buildable, str(revdeps)))
2231 2233
2232 # Convert scenequeue_covered task numbers into full taskgraph ids 2234 self.rq.scenequeue_covered = self.scenequeue_covered
2233 oldcovered = self.scenequeue_covered 2235 self.rq.scenequeue_notcovered = self.scenequeue_notcovered
2234 self.rq.scenequeue_covered = set()
2235 for task in oldcovered:
2236 self.rq.scenequeue_covered.add(task)
2237 2236
2238 logger.debug(1, 'We can skip tasks %s', sorted(self.rq.scenequeue_covered)) 2237 logger.debug(1, 'We can skip tasks %s', sorted(self.rq.scenequeue_covered))
2239 2238