diff options
author | Rob Bradford <rob@linux.intel.com> | 2008-10-24 16:22:19 +0100 |
---|---|---|
committer | Rob Bradford <rob@linux.intel.com> | 2008-10-27 10:19:54 +0000 |
commit | 2684070ac631787171a06926d324391756e6956b (patch) | |
tree | 25246af1cb186f8d2d0a26ffb33c52a45ed3f31b /bitbake-dev | |
parent | acdff2b1542a3e6a333fa2c58a8a64dcb7b86808 (diff) | |
download | poky-2684070ac631787171a06926d324391756e6956b.tar.gz |
bitbake-dev: Include target/command (from -c) in "buildTargets" command
This allows a UI to read / control which task for the given targets is used.
This makes it more consistent with the "buildFile" command.
Diffstat (limited to 'bitbake-dev')
-rw-r--r-- | bitbake-dev/lib/bb/command.py | 3 | ||||
-rw-r--r-- | bitbake-dev/lib/bb/cooker.py | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/bitbake-dev/lib/bb/command.py b/bitbake-dev/lib/bb/command.py index 0d4ef42569..5885b375ab 100644 --- a/bitbake-dev/lib/bb/command.py +++ b/bitbake-dev/lib/bb/command.py | |||
@@ -155,8 +155,9 @@ class CommandsAsync: | |||
155 | Build a set of targets | 155 | Build a set of targets |
156 | """ | 156 | """ |
157 | pkgs_to_build = params[0] | 157 | pkgs_to_build = params[0] |
158 | task = params[1] | ||
158 | 159 | ||
159 | command.cooker.buildTargets(pkgs_to_build) | 160 | command.cooker.buildTargets(pkgs_to_build, task) |
160 | 161 | ||
161 | def generateDepTreeEvent(self, command, params): | 162 | def generateDepTreeEvent(self, command, params): |
162 | """ | 163 | """ |
diff --git a/bitbake-dev/lib/bb/cooker.py b/bitbake-dev/lib/bb/cooker.py index 339bb45ec1..01537ab2f7 100644 --- a/bitbake-dev/lib/bb/cooker.py +++ b/bitbake-dev/lib/bb/cooker.py | |||
@@ -151,7 +151,7 @@ class BBCooker: | |||
151 | bb.error("Please specify a package name for dependency graph generation.") | 151 | bb.error("Please specify a package name for dependency graph generation.") |
152 | else: | 152 | else: |
153 | if self.configuration.pkgs_to_build: | 153 | if self.configuration.pkgs_to_build: |
154 | self.commandlineAction = ["buildTargets", self.configuration.pkgs_to_build] | 154 | self.commandlineAction = ["buildTargets", self.configuration.pkgs_to_build, self.configuration.cmd] |
155 | else: | 155 | else: |
156 | self.commandlineAction = None | 156 | self.commandlineAction = None |
157 | bb.error("Nothing to do. Use 'bitbake world' to build everything, or run 'bitbake --help' for usage information.") | 157 | bb.error("Nothing to do. Use 'bitbake world' to build everything, or run 'bitbake --help' for usage information.") |
@@ -677,7 +677,7 @@ class BBCooker: | |||
677 | self.cookerIdle = False | 677 | self.cookerIdle = False |
678 | self.server.register_idle_function(buildFileIdle, rq) | 678 | self.server.register_idle_function(buildFileIdle, rq) |
679 | 679 | ||
680 | def buildTargets(self, targets): | 680 | def buildTargets(self, targets, task): |
681 | """ | 681 | """ |
682 | Attempt to build the targets specified | 682 | Attempt to build the targets specified |
683 | """ | 683 | """ |
@@ -721,7 +721,7 @@ class BBCooker: | |||
721 | runlist = [] | 721 | runlist = [] |
722 | for k in targets: | 722 | for k in targets: |
723 | taskdata.add_provider(localdata, self.status, k) | 723 | taskdata.add_provider(localdata, self.status, k) |
724 | runlist.append([k, "do_%s" % self.configuration.cmd]) | 724 | runlist.append([k, "do_%s" % task]) |
725 | taskdata.add_unresolved(localdata, self.status) | 725 | taskdata.add_unresolved(localdata, self.status) |
726 | 726 | ||
727 | rq = bb.runqueue.RunQueue(self, self.configuration.data, self.status, taskdata, runlist) | 727 | rq = bb.runqueue.RunQueue(self, self.configuration.data, self.status, taskdata, runlist) |