summaryrefslogtreecommitdiff
path: root/bitbake-dev/lib/bb
diff options
context:
space:
mode:
authorRob Bradford <rob@linux.intel.com>2008-10-24 16:54:35 +0100
committerRob Bradford <rob@linux.intel.com>2008-10-27 10:19:54 +0000
commitc790192322c9c3ed98b13395d4980d88d394c3ff (patch)
tree870909231bce3af4a8204802ca3579da59def9a5 /bitbake-dev/lib/bb
parent2684070ac631787171a06926d324391756e6956b (diff)
downloadopenembedded-core-c790192322c9c3ed98b13395d4980d88d394c3ff.tar.gz
openembedded-core-c790192322c9c3ed98b13395d4980d88d394c3ff.tar.bz2
openembedded-core-c790192322c9c3ed98b13395d4980d88d394c3ff.tar.xz
openembedded-core-c790192322c9c3ed98b13395d4980d88d394c3ff.zip
bitbake-dev: Make the task a parameter of the "tryBuild" command
And switch the runqueue to use this rather than keeping it in the self.configuration.cmd variable
Diffstat (limited to 'bitbake-dev/lib/bb')
-rw-r--r--bitbake-dev/lib/bb/cooker.py4
-rw-r--r--bitbake-dev/lib/bb/runqueue.py3
2 files changed, 3 insertions, 4 deletions
diff --git a/bitbake-dev/lib/bb/cooker.py b/bitbake-dev/lib/bb/cooker.py
index 01537ab2f..5e3cccbdb 100644
--- a/bitbake-dev/lib/bb/cooker.py
+++ b/bitbake-dev/lib/bb/cooker.py
@@ -195,7 +195,7 @@ class BBCooker:
bb.msg.error(bb.msg.domain.Build, "%s event exception, aborting" % bb.event.getName(event))
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)
@@ -209,7 +209,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/bitbake-dev/lib/bb/runqueue.py b/bitbake-dev/lib/bb/runqueue.py
index 166720582..1c911ef0c 100644
--- a/bitbake-dev/lib/bb/runqueue.py
+++ b/bitbake-dev/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)