diff options
| author | Joshua Watt <JPEWhacker@gmail.com> | 2020-06-05 22:15:36 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-06-10 12:30:01 +0100 |
| commit | 0ecab7a461d7dc47cbd8f277019d87ee3df31283 (patch) | |
| tree | 5fe1d30790043c74ea1d0eb9e15ad52c82f198f2 /bitbake/lib/bb/command.py | |
| parent | c90dd50939b8de3330e3c27577f3503ef6f24f10 (diff) | |
| download | poky-0ecab7a461d7dc47cbd8f277019d87ee3df31283.tar.gz | |
bitbake: bitbake: command: Move split_mc_pn to runqueue
All of the other multiconfig splitting functions are located in runqueue
so move the function to split a pn/fn there also so that its easier to
see them all together. Fixes a case where the findBestProvider() command
wasn't working for multiconfig because it was looking for a prefix of
"multiconfig:" instead of the newer "mc:"
(Bitbake rev: 325827af66434affc2da460cc8b9a5c460e38056)
Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/command.py')
| -rw-r--r-- | bitbake/lib/bb/command.py | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/bitbake/lib/bb/command.py b/bitbake/lib/bb/command.py index d11907e3ba..3902ccca71 100644 --- a/bitbake/lib/bb/command.py +++ b/bitbake/lib/bb/command.py | |||
| @@ -138,12 +138,6 @@ class Command: | |||
| 138 | def reset(self): | 138 | def reset(self): |
| 139 | self.remotedatastores = bb.remotedata.RemoteDatastores(self.cooker) | 139 | self.remotedatastores = bb.remotedata.RemoteDatastores(self.cooker) |
| 140 | 140 | ||
| 141 | def split_mc_pn(pn): | ||
| 142 | if pn.startswith("multiconfig:"): | ||
| 143 | _, mc, pn = pn.split(":", 2) | ||
| 144 | return (mc, pn) | ||
| 145 | return ('', pn) | ||
| 146 | |||
| 147 | class CommandsSync: | 141 | class CommandsSync: |
| 148 | """ | 142 | """ |
| 149 | A class of synchronous commands | 143 | A class of synchronous commands |
| @@ -442,7 +436,7 @@ class CommandsSync: | |||
| 442 | findProviders.readonly = True | 436 | findProviders.readonly = True |
| 443 | 437 | ||
| 444 | def findBestProvider(self, command, params): | 438 | def findBestProvider(self, command, params): |
| 445 | (mc, pn) = split_mc_pn(params[0]) | 439 | (mc, pn) = bb.runqueue.split_mc(params[0]) |
| 446 | return command.cooker.findBestProvider(pn, mc) | 440 | return command.cooker.findBestProvider(pn, mc) |
| 447 | findBestProvider.readonly = True | 441 | findBestProvider.readonly = True |
| 448 | 442 | ||
