summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorJoshua Watt <JPEWhacker@gmail.com>2020-06-05 22:15:36 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-06-10 12:30:01 +0100
commit0ecab7a461d7dc47cbd8f277019d87ee3df31283 (patch)
tree5fe1d30790043c74ea1d0eb9e15ad52c82f198f2 /bitbake
parentc90dd50939b8de3330e3c27577f3503ef6f24f10 (diff)
downloadpoky-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')
-rw-r--r--bitbake/lib/bb/command.py8
-rw-r--r--bitbake/lib/bb/runqueue.py6
2 files changed, 7 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
141def split_mc_pn(pn):
142 if pn.startswith("multiconfig:"):
143 _, mc, pn = pn.split(":", 2)
144 return (mc, pn)
145 return ('', pn)
146
147class CommandsSync: 141class 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
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py
index 3d54c2b88a..5b7dab8d79 100644
--- a/bitbake/lib/bb/runqueue.py
+++ b/bitbake/lib/bb/runqueue.py
@@ -46,6 +46,12 @@ def split_tid(tid):
46 (mc, fn, taskname, _) = split_tid_mcfn(tid) 46 (mc, fn, taskname, _) = split_tid_mcfn(tid)
47 return (mc, fn, taskname) 47 return (mc, fn, taskname)
48 48
49def split_mc(n):
50 if n.startswith("mc:"):
51 _, mc, n = n.split(":", 2)
52 return (mc, n)
53 return ('', n)
54
49def split_tid_mcfn(tid): 55def split_tid_mcfn(tid):
50 if tid.startswith('mc:'): 56 if tid.startswith('mc:'):
51 elems = tid.split(':') 57 elems = tid.split(':')