summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Tian <kevin.tian@intel.com>2010-12-21 15:02:22 +0800
committerRichard Purdie <rpurdie@linux.intel.com>2010-12-21 08:48:17 +0000
commit05963b0a1b1a685a3df3d39477312bb629579fb4 (patch)
tree5571c920f382abbd3ae47e119e2e13adcf815316
parent67d6814b779a70234906e0aa58b819697a2629c5 (diff)
downloadpoky-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.py3
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:
1072 bb.mkdirhier(p) 1072 bb.mkdirhier(p)
1073 bb.msg.debug(2, bb.msg.domain.RunQueue, "Running %s:%s under fakeroot, state dir is %s" % (fn, taskname, fakedirs)) 1073 bb.msg.debug(2, bb.msg.domain.RunQueue, "Running %s:%s under fakeroot, state dir is %s" % (fn, taskname, fakedirs))
1074 1074
1075 env['BB_TASKHASH'] = self.rqdata.runq_hash[task]
1076 env['PATH'] = self.cooker.configuration.initial_path 1075 env['PATH'] = self.cooker.configuration.initial_path
1077 1076
1078 envbackup = os.environ.copy() 1077 envbackup = os.environ.copy()
@@ -1123,6 +1122,8 @@ class RunQueueExecute:
1123 for h in self.rqdata.hashdata["deps"]: 1122 for h in self.rqdata.hashdata["deps"]:
1124 bb.data.setVar("BBHASHDEPS_%s" % h, self.rqdata.hashdata["deps"][h], the_data) 1123 bb.data.setVar("BBHASHDEPS_%s" % h, self.rqdata.hashdata["deps"][h], the_data)
1125 1124
1125 bb.data.setVar("BB_TASKHASH", self.rqdata.runq_hash[task], the_data)
1126
1126 ret = 0 1127 ret = 0
1127 try: 1128 try:
1128 if not self.cooker.configuration.dry_run: 1129 if not self.cooker.configuration.dry_run: