From 355338c40c6fc65d10980cfd75e9ab5ff96ed43a Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 8 Jun 2011 17:23:42 +0100 Subject: bitbake/cooker.py: Misc sync with upstream Signed-off-by: Richard Purdie --- bitbake/lib/bb/runqueue.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'bitbake/lib/bb/runqueue.py') diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index afa1f8d736..52360accdb 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py @@ -753,7 +753,6 @@ class RunQueueData: self.rqdata.runq_depends[task], self.rqdata.runq_revdeps[task]) - class RunQueue: def __init__(self, cooker, cfgData, dataCache, taskData, targets): @@ -1106,8 +1105,10 @@ class RunQueueExecute: newsi = os.open(os.devnull, os.O_RDWR) os.dup2(newsi, sys.stdin.fileno()) - bb.data.setVar("BB_WORKERCONTEXT", "1", self.cooker.configuration.data) + bb.data.setVar("__RUNQUEUE_DO_NOT_USE_EXTERNALLY", self, self.cooker.configuration.data) + bb.data.setVar("__RUNQUEUE_DO_NOT_USE_EXTERNALLY2", fn, self.cooker.configuration.data) + bb.parse.siggen.set_taskdata(self.rqdata.hashes, self.rqdata.hash_deps) the_data = bb.cache.Cache.loadDataFull(fn, self.cooker.get_file_appends(fn), self.cooker.configuration.data) @@ -1124,9 +1125,6 @@ class RunQueueExecute: if quieterrors: the_data.setVarFlag(taskname, "quieterrors", "1") - bb.data.setVar("__RUNQUEUE_DO_NOT_USE_EXTERNALLY", self, self.cooker.configuration.data) - bb.data.setVar("__RUNQUEUE_DO_NOT_USE_EXTERNALLY2", fn, self.cooker.configuration.data) - bb.parse.siggen.set_taskdata(self.rqdata.hashes, self.rqdata.hash_deps) for h in self.rqdata.hashes: bb.data.setVar("BBHASH_%s" % h, self.rqdata.hashes[h], the_data) -- cgit v1.2.3-54-g00ecf