From e9c03fbfd7b057b28645affa263cb4aebfa24b04 Mon Sep 17 00:00:00 2001 From: Juro Bystricky Date: Mon, 10 Apr 2017 08:51:04 -0700 Subject: command.py: multiconfig support for findBestProvider In a multiconfig environment, a tinfoil call such as tinfoil.parse_recipe("multiconfig:arduino-101-sss:gcc") can fail with an error such as: File "/data/master/poky/bitbake/lib/bb/tinfoil.py", line 373, in get_recipe_file raise bb.providers.NoProvider('Unable to find any recipe file matching "%s"' % pn) bb.providers.NoProvider: Unable to find any recipe file matching "multiconfig:arduino-101-sss:gcc" The culprit is findBestProvider, which does not handle multiconfig. This patch fixes the error and in the case mentioned above the tinfoil call returns: "multiconfig:arduino-101-sss:/data/master/poky/meta/recipes-devtools/gcc/gcc_6.3.bb" [YOCTO#11210] Signed-off-by: Juro Bystricky Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- lib/bb/command.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/bb/command.py b/lib/bb/command.py index 78a86ac4d..390d4f1de 100644 --- a/lib/bb/command.py +++ b/lib/bb/command.py @@ -141,6 +141,12 @@ class Command: self.currentAsyncCommand = None self.cooker.finishcommand() +def split_mc_pn(pn): + if pn.startswith("multiconfig:"): + _, mc, pn = pn.split(":", 2) + return (mc, pn) + return ('', pn) + class CommandsSync: """ A class of synchronous commands @@ -425,8 +431,8 @@ class CommandsSync: findProviders.readonly = True def findBestProvider(self, command, params): - pn = params[0] - return command.cooker.findBestProvider(pn) + (mc, pn) = split_mc_pn(params[0]) + return command.cooker.findBestProvider(pn, mc) findBestProvider.readonly = True def allProviders(self, command, params): -- cgit 1.2.3-korg