diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2008-12-06 12:03:51 +0000 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2008-12-06 12:03:51 +0000 |
commit | 18baf8f89cbef4a9e965c6319f6a01b9cd7166bf (patch) | |
tree | 9fe079a24bd7b71754d4ff4d552e8cef0c79ac10 /lib/bb | |
parent | 08f4da09006c75e0df862bf839a7687a691284e4 (diff) | |
download | bitbake-18baf8f89cbef4a9e965c6319f6a01b9cd7166bf.tar.gz |
cooker.py: Pass the task to run to tryBuild directly, don't use self.configuration.cmd (From Rob Bradford in Poky)
Diffstat (limited to 'lib/bb')
-rw-r--r-- | lib/bb/cooker.py | 4 | ||||
-rw-r--r-- | lib/bb/runqueue.py | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py index b539fb28d..c67bdaef9 100644 --- a/lib/bb/cooker.py +++ b/lib/bb/cooker.py @@ -199,7 +199,7 @@ class BBCooker: bb.event.fire(bb.event.PkgFailed(item, the_data)) raise - def tryBuild(self, fn): + def tryBuild(self, fn, task): """ Build a provider and its dependencies. build_depends is a list of previous build dependencies (not runtime) @@ -213,7 +213,7 @@ class BBCooker: #if bb.build.stamp_is_current('do_%s' % self.configuration.cmd, the_data): # return True - return self.tryBuildPackage(fn, item, self.configuration.cmd, the_data) + return self.tryBuildPackage(fn, item, task, the_data) def showVersions(self): diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py index 20af618d9..01452d2f3 100644 --- a/lib/bb/runqueue.py +++ b/lib/bb/runqueue.py @@ -993,10 +993,9 @@ class RunQueue: os.setpgid(0, 0) newsi = os.open('/dev/null', os.O_RDWR) os.dup2(newsi, sys.stdin.fileno()) - self.cooker.configuration.cmd = taskname[3:] bb.data.setVar("__RUNQUEUE_DO_NOT_USE_EXTERNALLY", self, self.cooker.configuration.data) try: - self.cooker.tryBuild(fn) + self.cooker.tryBuild(fn, taskname[3:]) except bb.build.EventException: bb.msg.error(bb.msg.domain.Build, "Build of " + fn + " " + taskname + " failed") sys.exit(1) |