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-20 11:52:52 +0000
commit51abd41ff6e732ee0df61f380e4de23fdec7629a (patch)
tree33a1744267543b0bbd2a2405f67f9f9d339b902c
parent631229df720dc88047b702452c7ad172421cc1e4 (diff)
downloadpoky-51abd41ff6e732ee0df61f380e4de23fdec7629a.tar.gz
bitbake: 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. (Bitbake rev: 05763bc886024dcce2ce6b3060fb00abf79a9402) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xbitbake/bin/bitbake-worker2
-rw-r--r--bitbake/lib/bb/cooker.py1
-rw-r--r--bitbake/lib/bb/cookerdata.py1
3 files changed, 4 insertions, 0 deletions
diff --git a/bitbake/bin/bitbake-worker b/bitbake/bin/bitbake-worker
index 5010bada79..ee2d6224a5 100755
--- a/bitbake/bin/bitbake-worker
+++ b/bitbake/bin/bitbake-worker
@@ -222,6 +222,8 @@ def fork_off_task(cfg, data, databuilder, workerdata, fn, task, taskname, append
222 the_data = databuilder.mcdata[mc] 222 the_data = databuilder.mcdata[mc]
223 the_data.setVar("BB_WORKERCONTEXT", "1") 223 the_data.setVar("BB_WORKERCONTEXT", "1")
224 the_data.setVar("BB_TASKDEPDATA", taskdepdata) 224 the_data.setVar("BB_TASKDEPDATA", taskdepdata)
225 if cfg.limited_deps:
226 the_data.setVar("BB_LIMITEDDEPS", "1")
225 the_data.setVar("BUILDNAME", workerdata["buildname"]) 227 the_data.setVar("BUILDNAME", workerdata["buildname"])
226 the_data.setVar("DATE", workerdata["date"]) 228 the_data.setVar("DATE", workerdata["date"])
227 the_data.setVar("TIME", workerdata["time"]) 229 the_data.setVar("TIME", workerdata["time"])
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index a7b9745e89..80007c53de 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -1409,6 +1409,7 @@ class BBCooker:
1409 item = info_array[0].pn 1409 item = info_array[0].pn
1410 self.recipecaches[mc].ignored_dependencies = set() 1410 self.recipecaches[mc].ignored_dependencies = set()
1411 self.recipecaches[mc].bbfile_priority[fn] = 1 1411 self.recipecaches[mc].bbfile_priority[fn] = 1
1412 self.configuration.limited_deps = True
1412 1413
1413 # Remove external dependencies 1414 # Remove external dependencies
1414 self.recipecaches[mc].task_deps[fn]['depends'] = {} 1415 self.recipecaches[mc].task_deps[fn]['depends'] = {}
diff --git a/bitbake/lib/bb/cookerdata.py b/bitbake/lib/bb/cookerdata.py
index d9eab562cf..53f458786f 100644
--- a/bitbake/lib/bb/cookerdata.py
+++ b/bitbake/lib/bb/cookerdata.py
@@ -147,6 +147,7 @@ class CookerConfiguration(object):
147 self.interface = [] 147 self.interface = []
148 self.writeeventlog = False 148 self.writeeventlog = False
149 self.server_only = False 149 self.server_only = False
150 self.limited_deps = False
150 151
151 self.env = {} 152 self.env = {}
152 153