diff options
Diffstat (limited to 'bitbake')
| -rw-r--r-- | bitbake/lib/bb/cooker.py | 32 | ||||
| -rw-r--r-- | bitbake/lib/bb/runqueue.py | 14 |
2 files changed, 12 insertions, 34 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index 488bc610d..52a402cd9 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py @@ -162,38 +162,6 @@ class BBCooker: 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): # Need files parsed diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index a4aea6c00..afbc16a9f 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py @@ -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_EXTERNALLY2", fn, self.cooker.configuration.data) try: - self.cooker.tryBuild(fn, taskname[3:]) - except bb.build.EventException: + the_data = self.cooker.bb_cache.loadDataFull(fn, self.cooker.configuration.data) + + 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) except Exception: from traceback import format_exc |