diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2006-09-10 21:16:02 +0000 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2006-09-10 21:16:02 +0000 |
commit | ebed7f1cd6b8046a2467e141badbf7776e24cce9 (patch) | |
tree | 2ec3b81c0a55b4067d8b61244a9f3e18ce0a6621 /bin | |
parent | 37333edd9afa7ff7a8926ba85d1cc2c246cc6c1e (diff) | |
download | bitbake-ebed7f1cd6b8046a2467e141badbf7776e24cce9.tar.gz |
lib/bb/shell.py - Use taskData and runQueue directly
lib/bb/runqueue.py - Add fn to TaskFailure
bin/bitbake - Remove now uneeded buildProvider
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/bitbake | 41 |
1 files changed, 5 insertions, 36 deletions
diff --git a/bin/bitbake b/bin/bitbake index ecd640012..8ec8d64f3 100755 --- a/bin/bitbake +++ b/bin/bitbake @@ -351,41 +351,6 @@ class BBCooker: add_all_depends( pkgs_to_build, [] ) print >> alldepends_file, "}" - def buildProvider( self, item , buildAllDeps , build_depends = [] ): - """ - Build something to provide a named build requirement - (takes item names from DEPENDS namespace) - """ - - taskdata = bb.taskdata.TaskData() - - try: - taskdata.add_provider(self.configuration.data, self.status, item) - except bb.providers.NoProvider: - return 0 - - providers = taskdata.get_provider(item) - - if len(providers) == 0: - return 0 - - for p in providers: - if p in self.build_cache: - bb.msg.debug(1, bb.msg.domain.Provider, "already built %s in this run" % p) - return 1 - - taskdata.add_unresolved(self.configuration.data, self.status) - - tasks = [[item, "do_%s" % self.configuration.cmd]] - rq = bb.runqueue.RunQueue() - rq.prepare_runqueue(self.configuration.data, self.status, taskdata, tasks) - rq.execute_runqueue(self, self.configuration.data, self.status, taskdata, tasks) - - #taskdata.dump_data() - #rq.dump_data(taskdata) - - return 1 - def buildDepgraph( self ): all_depends = self.status.all_depends pn_provides = self.status.pn_provides @@ -657,7 +622,11 @@ class BBCooker: rq = bb.runqueue.RunQueue() rq.prepare_runqueue(self.configuration.data, self.status, taskdata, runlist) - failures = rq.execute_runqueue(self, self.configuration.data, self.status, taskdata, runlist) + try: + failures = rq.execute_runqueue(self, self.configuration.data, self.status, taskdata, runlist) + except runqueue.TaskFailure, (fnid, fn, taskname): + bb.msg.error(bb.msg.domain.Build, "'%s, %s' failed" % (fn, taskname)) + sys.exit(1) bb.event.fire(bb.event.BuildCompleted(buildname, pkgs_to_build, self.configuration.event_data, failures)) |