From 05963b0a1b1a685a3df3d39477312bb629579fb4 Mon Sep 17 00:00:00 2001 From: Kevin Tian Date: Tue, 21 Dec 2010 15:02:22 +0800 Subject: runqueue.py: set BB_TASKHASH approriately after moving to fork() In previous exec() model, cooker is re-initialized from scratch with environmental variable exported accordingly. Now in fork() model, environmental variables are not exported again, and thus original method to export BB_TASKHASH doesn't apply now which breaks all sstate packages. Now we can set data variable directly instead. Signed-off-by: Kevin Tian --- bitbake/lib/bb/runqueue.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'bitbake/lib') diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index 37e1ac0..4f988df 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py @@ -1072,7 +1072,6 @@ class RunQueueExecute: bb.mkdirhier(p) bb.msg.debug(2, bb.msg.domain.RunQueue, "Running %s:%s under fakeroot, state dir is %s" % (fn, taskname, fakedirs)) - env['BB_TASKHASH'] = self.rqdata.runq_hash[task] env['PATH'] = self.cooker.configuration.initial_path envbackup = os.environ.copy() @@ -1123,6 +1122,8 @@ class RunQueueExecute: for h in self.rqdata.hashdata["deps"]: bb.data.setVar("BBHASHDEPS_%s" % h, self.rqdata.hashdata["deps"][h], the_data) + bb.data.setVar("BB_TASKHASH", self.rqdata.runq_hash[task], the_data) + ret = 0 try: if not self.cooker.configuration.dry_run: -- cgit v1.1