summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-14 14:16:44 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-19 15:22:24 +0000
commit05763bc886024dcce2ce6b3060fb00abf79a9402 (patch)
tree3706cfc05ce0739fb735573a1796e14feb0a8338
parent4dcd0e53f5ff4bf4f2d6cbdc51ff33a5f5f206af (diff)
downloadopenembedded-core-contrib-05763bc886024dcce2ce6b3060fb00abf79a9402.tar.gz
cooker: Add BB_LIMITEDDEPS support
When we're running with bitbake -b, BB_TASKDEPDATA is incorrect and limited. We really need a way to know this from the metadata and this new variable provides this in worker context. This means existing code can stop having to guess. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xbin/bitbake-worker2
-rw-r--r--lib/bb/cooker.py1
-rw-r--r--lib/bb/cookerdata.py1
3 files changed, 4 insertions, 0 deletions
diff --git a/bin/bitbake-worker b/bin/bitbake-worker
index 5010bada79..ee2d6224a5 100755
--- a/bin/bitbake-worker
+++ b/bin/bitbake-worker
@@ -222,6 +222,8 @@ def fork_off_task(cfg, data, databuilder, workerdata, fn, task, taskname, append
the_data = databuilder.mcdata[mc]
the_data.setVar("BB_WORKERCONTEXT", "1")
the_data.setVar("BB_TASKDEPDATA", taskdepdata)
+ if cfg.limited_deps:
+ the_data.setVar("BB_LIMITEDDEPS", "1")
the_data.setVar("BUILDNAME", workerdata["buildname"])
the_data.setVar("DATE", workerdata["date"])
the_data.setVar("TIME", workerdata["time"])
diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py
index a7b9745e89..80007c53de 100644
--- a/lib/bb/cooker.py
+++ b/lib/bb/cooker.py
@@ -1409,6 +1409,7 @@ class BBCooker:
item = info_array[0].pn
self.recipecaches[mc].ignored_dependencies = set()
self.recipecaches[mc].bbfile_priority[fn] = 1
+ self.configuration.limited_deps = True
# Remove external dependencies
self.recipecaches[mc].task_deps[fn]['depends'] = {}
diff --git a/lib/bb/cookerdata.py b/lib/bb/cookerdata.py
index d9eab562cf..53f458786f 100644
--- a/lib/bb/cookerdata.py
+++ b/lib/bb/cookerdata.py
@@ -147,6 +147,7 @@ class CookerConfiguration(object):
self.interface = []
self.writeeventlog = False
self.server_only = False
+ self.limited_deps = False
self.env = {}