summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-16 14:40:24 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-20 11:52:52 +0000
commit918736d6c94753ef0ae53457662cb09dbd6b092c (patch)
tree3658d33cb977d772a80be84aaac2579811922b24
parenta304b94eae99ade6d99800eeaf588c48d01506f6 (diff)
downloadpoky-918736d6c94753ef0ae53457662cb09dbd6b092c.tar.gz
bitbake: cooker: Only add universe targets where the task exists
Currently "bitbake universe -c fetch" will error if every task in the system doesn't have a fetch task. This seems unreasonable so filter the list based upon whether the task exists. This implementation does assume if a task exits for a given provider name, it can run, even if the preferred provider that ends up getting built might be the namespace without the task. This is unlikely to be a real world issue at this point. (Bitbake rev: 438986f4e39974930ee3205ca4c4d620090e57bb) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/cooker.py9
1 files changed, 9 insertions, 0 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index 5608845611..a7b9745e89 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -1704,6 +1704,15 @@ class BBCooker:
1704 pkgs_to_build.remove('universe') 1704 pkgs_to_build.remove('universe')
1705 for mc in self.multiconfigs: 1705 for mc in self.multiconfigs:
1706 for t in self.recipecaches[mc].universe_target: 1706 for t in self.recipecaches[mc].universe_target:
1707 if task:
1708 foundtask = False
1709 for provider_fn in self.recipecaches[mc].providers[t]:
1710 if task in self.recipecaches[mc].task_deps[provider_fn]['tasks']:
1711 foundtask = True
1712 break
1713 if not foundtask:
1714 bb.debug(1, "Skipping %s for universe tasks as task %s doesn't exist" % (t, task))
1715 continue
1707 if mc: 1716 if mc:
1708 t = "multiconfig:" + mc + ":" + t 1717 t = "multiconfig:" + mc + ":" + t
1709 pkgs_to_build.append(t) 1718 pkgs_to_build.append(t)