diff options
author | Joshua Watt <jpewhacker@gmail.com> | 2020-03-04 14:02:24 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-03-06 17:23:21 +0000 |
commit | ea0b68ac2b77676ed1c63f0ee1ae5d300f2b4696 (patch) | |
tree | 586115a79046d4ce155c6bb3c4e191806b3a4e6e | |
parent | 95bb446137734865f3fe04fe97681d90250deb11 (diff) | |
download | bitbake-ea0b68ac2b77676ed1c63f0ee1ae5d300f2b4696.tar.gz |
cooker: Respect multiconfig parameter
The cooker had a multiconfig parameter for the findProviders() and
findBestProviders() API, but it was being ignored.
Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | lib/bb/cooker.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py index bda6d1b5c..e527e2311 100644 --- a/lib/bb/cooker.py +++ b/lib/bb/cooker.py @@ -1023,16 +1023,16 @@ class BBCooker: bb.event.fire(bb.event.FilesMatchingFound(filepattern, matches), self.data) def findProviders(self, mc=''): - return bb.providers.findProviders(self.data, self.recipecaches[mc], self.recipecaches[mc].pkg_pn) + return bb.providers.findProviders(self.databuilder.mcdata[mc], self.recipecaches[mc], self.recipecaches[mc].pkg_pn) def findBestProvider(self, pn, mc=''): if pn in self.recipecaches[mc].providers: filenames = self.recipecaches[mc].providers[pn] - eligible, foundUnique = bb.providers.filterProviders(filenames, pn, self.data, self.recipecaches[mc]) + eligible, foundUnique = bb.providers.filterProviders(filenames, pn, self.databuilder.mcdata[mc], self.recipecaches[mc]) filename = eligible[0] return None, None, None, filename elif pn in self.recipecaches[mc].pkg_pn: - return bb.providers.findBestProvider(pn, self.data, self.recipecaches[mc], self.recipecaches[mc].pkg_pn) + return bb.providers.findBestProvider(pn, self.databuilder.mcdata[mc], self.recipecaches[mc], self.recipecaches[mc].pkg_pn) else: return None, None, None, None |