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
This commit is contained in:
parent
2684070ac6
commit
c790192322
|
@ -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):
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue