diff options
author | Joshua Watt <jpewhacker@gmail.com> | 2020-03-04 14:02:24 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-03-07 16:07:00 +0000 |
commit | e57d1d3906ab265e88d18fa42c644ce6ca81378c (patch) | |
tree | ef51e379f595a5082fb64a3754b98a08afa3e55f /bitbake | |
parent | 86aa524667e73772aaf21a1dd1b745ccb28f3a83 (diff) | |
download | poky-e57d1d3906ab265e88d18fa42c644ce6ca81378c.tar.gz |
bitbake: cooker: Respect multiconfig parameter
The cooker had a multiconfig parameter for the findProviders() and
findBestProviders() API, but it was being ignored.
(Bitbake rev: ea0b68ac2b77676ed1c63f0ee1ae5d300f2b4696)
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/cooker.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index bda6d1b5c4..e527e23114 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py | |||
@@ -1023,16 +1023,16 @@ class BBCooker: | |||
1023 | bb.event.fire(bb.event.FilesMatchingFound(filepattern, matches), self.data) | 1023 | bb.event.fire(bb.event.FilesMatchingFound(filepattern, matches), self.data) |
1024 | 1024 | ||
1025 | def findProviders(self, mc=''): | 1025 | def findProviders(self, mc=''): |
1026 | return bb.providers.findProviders(self.data, self.recipecaches[mc], self.recipecaches[mc].pkg_pn) | 1026 | return bb.providers.findProviders(self.databuilder.mcdata[mc], self.recipecaches[mc], self.recipecaches[mc].pkg_pn) |
1027 | 1027 | ||
1028 | def findBestProvider(self, pn, mc=''): | 1028 | def findBestProvider(self, pn, mc=''): |
1029 | if pn in self.recipecaches[mc].providers: | 1029 | if pn in self.recipecaches[mc].providers: |
1030 | filenames = self.recipecaches[mc].providers[pn] | 1030 | filenames = self.recipecaches[mc].providers[pn] |
1031 | eligible, foundUnique = bb.providers.filterProviders(filenames, pn, self.data, self.recipecaches[mc]) | 1031 | eligible, foundUnique = bb.providers.filterProviders(filenames, pn, self.databuilder.mcdata[mc], self.recipecaches[mc]) |
1032 | filename = eligible[0] | 1032 | filename = eligible[0] |
1033 | return None, None, None, filename | 1033 | return None, None, None, filename |
1034 | elif pn in self.recipecaches[mc].pkg_pn: | 1034 | elif pn in self.recipecaches[mc].pkg_pn: |
1035 | return bb.providers.findBestProvider(pn, self.data, self.recipecaches[mc], self.recipecaches[mc].pkg_pn) | 1035 | return bb.providers.findBestProvider(pn, self.databuilder.mcdata[mc], self.recipecaches[mc], self.recipecaches[mc].pkg_pn) |
1036 | else: | 1036 | else: |
1037 | return None, None, None, None | 1037 | return None, None, None, None |
1038 | 1038 | ||