diff options
| author |   Kevin Tian <kevin.tian@intel.com> | 2010-12-21 15:02:22 +0800 |
|---|---|---|
| committer |   Richard Purdie <rpurdie@linux.intel.com> | 2010-12-21 08:48:17 +0000 |
| commit | 05963b0a1b1a685a3df3d39477312bb629579fb4 (patch) | |
| tree | 5571c920f382abbd3ae47e119e2e13adcf815316 | |
| parent | 67d6814b779a70234906e0aa58b819697a2629c5 (diff) | |
| download | openembedded-core-05963b0a1b1a685a3df3d39477312bb629579fb4.tar.gz | |
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 <kevin.tian@intel.com>
| -rw-r--r-- | bitbake/lib/bb/runqueue.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index 37e1ac06bf..4f988dfdc9 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: |