summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bblayers
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-08-15 17:00:45 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-08-18 09:06:26 (GMT)
commit97ce9126a6de2faf78441f686a1b52b5f68f9a62 (patch)
tree972e1f7c930fb2aa003d3725e813601f8ea997b8 /bitbake/lib/bblayers
parent4cd5647f125f61a45d3145b54277471fa1a31433 (diff)
downloadpoky-97ce9126a6de2faf78441f686a1b52b5f68f9a62.tar.gz
bitbake: cache: Make virtualfn2realfn/realfn2virtual standalone functions
Needing to access these static methods through a class doesn't make sense. Move these to become module level standalone functions. (Bitbake rev: 6d06e93c6a2204af6d2cf747a4610bd0eeb9f202) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bblayers')
-rw-r--r--bitbake/lib/bblayers/query.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/bitbake/lib/bblayers/query.py b/bitbake/lib/bblayers/query.py
index 0a49681..6e62082 100644
--- a/bitbake/lib/bblayers/query.py
+++ b/bitbake/lib/bblayers/query.py
@@ -170,7 +170,7 @@ skipped recipes will also be listed, with a " (skipped)" suffix.
170 170
171 if len(allproviders[p]) > 1 or not show_multi_provider_only: 171 if len(allproviders[p]) > 1 or not show_multi_provider_only:
172 pref = preferred_versions[p] 172 pref = preferred_versions[p]
173 realfn = bb.cache.Cache.virtualfn2realfn(pref[1]) 173 realfn = bb.cache.virtualfn2realfn(pref[1])
174 preffile = realfn[0] 174 preffile = realfn[0]
175 175
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
@@ -200,7 +200,7 @@ skipped recipes will also be listed, with a " (skipped)" suffix.
200 same_ver = True 200 same_ver = True
201 provs = [] 201 provs = []
202 for prov in allproviders[p]: 202 for prov in allproviders[p]:
203 provfile = bb.cache.Cache.virtualfn2realfn(prov[1])[0] 203 provfile = bb.cache.virtualfn2realfn(prov[1])[0]
204 provlayer = self.get_file_layer(provfile) 204 provlayer = self.get_file_layer(provfile)
205 provs.append((provfile, provlayer, prov[0])) 205 provs.append((provfile, provlayer, prov[0]))
206 if provlayer != preflayer: 206 if provlayer != preflayer:
@@ -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.Cache.virtualfn2realfn(filename) 300 _, cls = bb.cache.virtualfn2realfn(filename)
301 if cls: 301 if cls:
302 continue 302 continue
303 303
@@ -328,7 +328,7 @@ NOTE: .bbappend files can impact the dependencies.
328 328
329 # The bb's DEPENDS and RDEPENDS 329 # The bb's DEPENDS and RDEPENDS
330 for f in pkg_fn: 330 for f in pkg_fn:
331 f = bb.cache.Cache.virtualfn2realfn(f)[0] 331 f = bb.cache.virtualfn2realfn(f)[0]
332 # Get the layername that the file is in 332 # Get the layername that the file is in
333 layername = self.get_file_layer(f) 333 layername = self.get_file_layer(f)
334 334
@@ -471,7 +471,7 @@ NOTE: .bbappend files can impact the dependencies.
471 471
472 def check_cross_depends(self, keyword, layername, f, needed_file, show_filenames, ignore_layers): 472 def check_cross_depends(self, keyword, layername, f, needed_file, show_filenames, ignore_layers):
473 """Print the DEPENDS/RDEPENDS file that crosses a layer boundary""" 473 """Print the DEPENDS/RDEPENDS file that crosses a layer boundary"""
474 best_realfn = bb.cache.Cache.virtualfn2realfn(needed_file)[0] 474 best_realfn = bb.cache.virtualfn2realfn(needed_file)[0]
475 needed_layername = self.get_file_layer(best_realfn) 475 needed_layername = self.get_file_layer(best_realfn)
476 if needed_layername != layername and not needed_layername in ignore_layers: 476 if needed_layername != layername and not needed_layername in ignore_layers:
477 if not show_filenames: 477 if not show_filenames: