summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bblayers
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake/lib/bblayers')
-rw-r--r--bitbake/lib/bblayers/action.py2
-rw-r--r--bitbake/lib/bblayers/query.py12
2 files changed, 7 insertions, 7 deletions
diff --git a/bitbake/lib/bblayers/action.py b/bitbake/lib/bblayers/action.py
index d4c1792f60..739ae27b97 100644
--- a/bitbake/lib/bblayers/action.py
+++ b/bitbake/lib/bblayers/action.py
@@ -173,7 +173,7 @@ build results (as the layer priority order has effectively changed).
173 # have come from) 173 # have come from)
174 first_regex = None 174 first_regex = None
175 layerdir = layers[0] 175 layerdir = layers[0]
176 for layername, pattern, regex, _ in self.tinfoil.cooker.recipecache.bbfile_config_priorities: 176 for layername, pattern, regex, _ in self.tinfoil.cooker.bbfile_config_priorities:
177 if regex.match(os.path.join(layerdir, 'test')): 177 if regex.match(os.path.join(layerdir, 'test')):
178 first_regex = regex 178 first_regex = regex
179 break 179 break
diff --git a/bitbake/lib/bblayers/query.py b/bitbake/lib/bblayers/query.py
index 6e62082a2e..ee1e7c8a1c 100644
--- a/bitbake/lib/bblayers/query.py
+++ b/bitbake/lib/bblayers/query.py
@@ -23,7 +23,7 @@ class QueryPlugin(LayerPlugin):
23 """show current configured layers.""" 23 """show current configured layers."""
24 logger.plain("%s %s %s" % ("layer".ljust(20), "path".ljust(40), "priority")) 24 logger.plain("%s %s %s" % ("layer".ljust(20), "path".ljust(40), "priority"))
25 logger.plain('=' * 74) 25 logger.plain('=' * 74)
26 for layer, _, regex, pri in self.tinfoil.cooker.recipecache.bbfile_config_priorities: 26 for layer, _, regex, pri in self.tinfoil.cooker.bbfile_config_priorities:
27 layerdir = self.bbfile_collections.get(layer, None) 27 layerdir = self.bbfile_collections.get(layer, None)
28 layername = self.get_layer_name(layerdir) 28 layername = self.get_layer_name(layerdir)
29 logger.plain("%s %s %d" % (layername.ljust(20), layerdir.ljust(40), pri)) 29 logger.plain("%s %s %d" % (layername.ljust(20), layerdir.ljust(40), pri))
@@ -121,9 +121,9 @@ skipped recipes will also be listed, with a " (skipped)" suffix.
121 logger.error('No class named %s found in BBPATH', classfile) 121 logger.error('No class named %s found in BBPATH', classfile)
122 sys.exit(1) 122 sys.exit(1)
123 123
124 pkg_pn = self.tinfoil.cooker.recipecache.pkg_pn 124 pkg_pn = self.tinfoil.cooker.recipecaches[''].pkg_pn
125 (latest_versions, preferred_versions) = bb.providers.findProviders(self.tinfoil.config_data, self.tinfoil.cooker.recipecache, pkg_pn) 125 (latest_versions, preferred_versions) = bb.providers.findProviders(self.tinfoil.config_data, self.tinfoil.cooker.recipecaches[''], pkg_pn)
126 allproviders = bb.providers.allProviders(self.tinfoil.cooker.recipecache) 126 allproviders = bb.providers.allProviders(self.tinfoil.cooker.recipecaches[''])
127 127
128 # Ensure we list skipped recipes 128 # Ensure we list skipped recipes
129 # We are largely guessing about PN, PV and the preferred version here, 129 # We are largely guessing about PN, PV and the preferred version here,
@@ -176,7 +176,7 @@ skipped recipes will also be listed, with a " (skipped)" suffix.
176 # We only display once per recipe, we should prefer non extended versions of the 176 # We only display once per recipe, we should prefer non extended versions of the
177 # recipe if present (so e.g. in OpenEmbedded, openssl rather than nativesdk-openssl 177 # recipe if present (so e.g. in OpenEmbedded, openssl rather than nativesdk-openssl
178 # which would otherwise sort first). 178 # which would otherwise sort first).
179 if realfn[1] and realfn[0] in self.tinfoil.cooker.recipecache.pkg_fn: 179 if realfn[1] and realfn[0] in self.tinfoil.cooker.recipecaches[''].pkg_fn:
180 continue 180 continue
181 181
182 if inherits: 182 if inherits:
@@ -297,7 +297,7 @@ Lists recipes with the bbappends that apply to them as subitems.
297 def get_appends_for_files(self, filenames): 297 def get_appends_for_files(self, filenames):
298 appended, notappended = [], [] 298 appended, notappended = [], []
299 for filename in filenames: 299 for filename in filenames:
300 _, cls = bb.cache.virtualfn2realfn(filename) 300 _, cls, _ = bb.cache.virtualfn2realfn(filename)
301 if cls: 301 if cls:
302 continue 302 continue
303 303