bitbake: Remove two layers of unnecessary functions from task execution
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
parent
2fa0c30375
commit
90db9f3074
|
@ -162,38 +162,6 @@ class BBCooker:
|
||||||
|
|
||||||
return self.command.runAsyncCommand()
|
return self.command.runAsyncCommand()
|
||||||
|
|
||||||
def tryBuildPackage(self, fn, item, task, the_data):
|
|
||||||
"""
|
|
||||||
Build one task of a package, optionally build following task depends
|
|
||||||
"""
|
|
||||||
try:
|
|
||||||
if not self.configuration.dry_run:
|
|
||||||
bb.build.exec_task('do_%s' % task, the_data)
|
|
||||||
return True
|
|
||||||
except bb.build.FuncFailed:
|
|
||||||
bb.msg.error(bb.msg.domain.Build, "task stack execution failed")
|
|
||||||
raise
|
|
||||||
except bb.build.EventException as e:
|
|
||||||
event = e.args[1]
|
|
||||||
bb.msg.error(bb.msg.domain.Build, "%s event exception, aborting" % bb.event.getName(event))
|
|
||||||
raise
|
|
||||||
|
|
||||||
def tryBuild(self, fn, task):
|
|
||||||
"""
|
|
||||||
Build a provider and its dependencies.
|
|
||||||
build_depends is a list of previous build dependencies (not runtime)
|
|
||||||
If build_depends is empty, we're dealing with a runtime depends
|
|
||||||
"""
|
|
||||||
|
|
||||||
the_data = self.bb_cache.loadDataFull(fn, self.configuration.data)
|
|
||||||
|
|
||||||
item = self.status.pkg_fn[fn]
|
|
||||||
|
|
||||||
#if bb.build.stamp_is_current('do_%s' % self.configuration.cmd, the_data):
|
|
||||||
# return True
|
|
||||||
|
|
||||||
return self.tryBuildPackage(fn, item, task, the_data)
|
|
||||||
|
|
||||||
def showVersions(self):
|
def showVersions(self):
|
||||||
|
|
||||||
# Need files parsed
|
# Need files parsed
|
||||||
|
|
|
@ -979,8 +979,18 @@ class RunQueue:
|
||||||
bb.data.setVar("__RUNQUEUE_DO_NOT_USE_EXTERNALLY", self, self.cooker.configuration.data)
|
bb.data.setVar("__RUNQUEUE_DO_NOT_USE_EXTERNALLY", self, self.cooker.configuration.data)
|
||||||
bb.data.setVar("__RUNQUEUE_DO_NOT_USE_EXTERNALLY2", fn, self.cooker.configuration.data)
|
bb.data.setVar("__RUNQUEUE_DO_NOT_USE_EXTERNALLY2", fn, self.cooker.configuration.data)
|
||||||
try:
|
try:
|
||||||
self.cooker.tryBuild(fn, taskname[3:])
|
the_data = self.cooker.bb_cache.loadDataFull(fn, self.cooker.configuration.data)
|
||||||
except bb.build.EventException:
|
|
||||||
|
if not self.cooker.configuration.dry_run:
|
||||||
|
bb.build.exec_task(taskname, the_data)
|
||||||
|
os._exit(0)
|
||||||
|
|
||||||
|
except bb.build.FuncFailed:
|
||||||
|
bb.msg.error(bb.msg.domain.Build, "task stack execution failed")
|
||||||
|
os._exit(1)
|
||||||
|
except bb.build.EventException as e:
|
||||||
|
event = e.args[1]
|
||||||
|
bb.msg.error(bb.msg.domain.Build, "%s event exception, aborting" % bb.event.getName(event))
|
||||||
os._exit(1)
|
os._exit(1)
|
||||||
except Exception:
|
except Exception:
|
||||||
from traceback import format_exc
|
from traceback import format_exc
|
||||||
|
|
Loading…
Reference in New Issue