summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/cooker.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index ff508f6b5e..9537239b03 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -244,13 +244,18 @@ class BBCooker:
244 # Need files parsed 244 # Need files parsed
245 self.updateCache() 245 self.updateCache()
246 246
247 # Need to ensure data store is expanded
248 localdata = data.createCopy(self.configuration.data)
249 bb.data.update_data(localdata)
250 bb.data.expandKeys(localdata)
251
247 pkg_pn = self.status.pkg_pn 252 pkg_pn = self.status.pkg_pn
248 preferred_versions = {} 253 preferred_versions = {}
249 latest_versions = {} 254 latest_versions = {}
250 255
251 # Sort by priority 256 # Sort by priority
252 for pn in pkg_pn: 257 for pn in pkg_pn:
253 (last_ver, last_file, pref_ver, pref_file) = bb.providers.findBestProvider(pn, self.configuration.data, self.status) 258 (last_ver, last_file, pref_ver, pref_file) = bb.providers.findBestProvider(pn, localdata, self.status)
254 preferred_versions[pn] = (pref_ver, pref_file) 259 preferred_versions[pn] = (pref_ver, pref_file)
255 latest_versions[pn] = (last_ver, last_file) 260 latest_versions[pn] = (last_ver, last_file)
256 261