diff options
Diffstat (limited to 'bitbake-dev/lib/bb/cooker.py')
| -rw-r--r-- | bitbake-dev/lib/bb/cooker.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/bitbake-dev/lib/bb/cooker.py b/bitbake-dev/lib/bb/cooker.py index 0fed1ba842..c9afadbc97 100644 --- a/bitbake-dev/lib/bb/cooker.py +++ b/bitbake-dev/lib/bb/cooker.py | |||
| @@ -145,7 +145,7 @@ class BBCooker: | |||
| 145 | self.commandlineAction = ["parseFiles"] | 145 | self.commandlineAction = ["parseFiles"] |
| 146 | elif self.configuration.dot_graph: | 146 | elif self.configuration.dot_graph: |
| 147 | if self.configuration.pkgs_to_build: | 147 | if self.configuration.pkgs_to_build: |
| 148 | self.commandlineAction = ["generateDotGraph", self.configuration.pkgs_to_build] | 148 | self.commandlineAction = ["generateDotGraph", self.configuration.pkgs_to_build, self.configuration.cmd] |
| 149 | else: | 149 | else: |
| 150 | self.commandlineAction = None | 150 | self.commandlineAction = None |
| 151 | bb.error("Please specify a package name for dependency graph generation.") | 151 | bb.error("Please specify a package name for dependency graph generation.") |
| @@ -302,7 +302,7 @@ class BBCooker: | |||
| 302 | if data.getVarFlag( e, 'python', envdata ): | 302 | if data.getVarFlag( e, 'python', envdata ): |
| 303 | bb.msg.plain("\npython %s () {\n%s}\n" % (e, data.getVar(e, envdata, 1))) | 303 | bb.msg.plain("\npython %s () {\n%s}\n" % (e, data.getVar(e, envdata, 1))) |
| 304 | 304 | ||
| 305 | def generateDepTreeData(self, pkgs_to_build): | 305 | def generateDepTreeData(self, pkgs_to_build, task): |
| 306 | """ | 306 | """ |
| 307 | Create a dependency tree of pkgs_to_build, returning the data. | 307 | Create a dependency tree of pkgs_to_build, returning the data. |
| 308 | """ | 308 | """ |
| @@ -320,7 +320,7 @@ class BBCooker: | |||
| 320 | runlist = [] | 320 | runlist = [] |
| 321 | for k in pkgs_to_build: | 321 | for k in pkgs_to_build: |
| 322 | taskdata.add_provider(localdata, self.status, k) | 322 | taskdata.add_provider(localdata, self.status, k) |
| 323 | runlist.append([k, "do_%s" % self.configuration.cmd]) | 323 | runlist.append([k, "do_%s" % task]) |
| 324 | taskdata.add_unresolved(localdata, self.status) | 324 | taskdata.add_unresolved(localdata, self.status) |
| 325 | 325 | ||
| 326 | rq = bb.runqueue.RunQueue(self, self.configuration.data, self.status, taskdata, runlist) | 326 | rq = bb.runqueue.RunQueue(self, self.configuration.data, self.status, taskdata, runlist) |
| @@ -390,21 +390,21 @@ class BBCooker: | |||
| 390 | return depend_tree | 390 | return depend_tree |
| 391 | 391 | ||
| 392 | 392 | ||
| 393 | def generateDepTreeEvent(self, pkgs_to_build): | 393 | def generateDepTreeEvent(self, pkgs_to_build, task): |
| 394 | """ | 394 | """ |
| 395 | Create a task dependency graph of pkgs_to_build. | 395 | Create a task dependency graph of pkgs_to_build. |
| 396 | Generate an event with the result | 396 | Generate an event with the result |
| 397 | """ | 397 | """ |
| 398 | depgraph = self.generateDepTreeData(pkgs_to_build) | 398 | depgraph = self.generateDepTreeData(pkgs_to_build, task) |
| 399 | bb.event.fire(bb.event.DepTreeGenerated(self.configuration.data, depgraph)) | 399 | bb.event.fire(bb.event.DepTreeGenerated(self.configuration.data, depgraph)) |
| 400 | 400 | ||
| 401 | def generateDotGraphFiles(self, pkgs_to_build): | 401 | def generateDotGraphFiles(self, pkgs_to_build, task): |
| 402 | """ | 402 | """ |
| 403 | Create a task dependency graph of pkgs_to_build. | 403 | Create a task dependency graph of pkgs_to_build. |
| 404 | Save the result to a set of .dot files. | 404 | Save the result to a set of .dot files. |
| 405 | """ | 405 | """ |
| 406 | 406 | ||
| 407 | depgraph = self.generateDepTreeData(pkgs_to_build) | 407 | depgraph = self.generateDepTreeData(pkgs_to_build, task) |
| 408 | 408 | ||
| 409 | # Prints a flattened form of package-depends below where subpackages of a package are merged into the main pn | 409 | # Prints a flattened form of package-depends below where subpackages of a package are merged into the main pn |
| 410 | depends_file = file('pn-depends.dot', 'w' ) | 410 | depends_file = file('pn-depends.dot', 'w' ) |
