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>

diff --git a/bin/bitbake-worker b/bin/bitbake-worker
index 5010bada7950436248ce0fbb7490fc58cc52b78e..ee2d6224a59ad29845ced09394b9f4f92c41fbb5 100755 (executable)
--- 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 a7b9745e89548ac420ce995025d81e59967f55bd..80007c53de7021fa05e5a2838eaf7c713ee358b8 100644 (file)
--- 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 d9eab562cf4b1c2a92075d1e6db38a75c631ae1b..53f458786fbba52417747d5149574c31a0fa0841 100644 (file)
--- 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 = {}