summaryrefslogtreecommitdiffstats
path: root/bitbake/lib
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2015-08-19 14:20:10 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-19 18:05:49 +0100
commita3967e2ba531fbc4880c5efe8f9d1683428297e2 (patch)
tree221dcab2fe9a58efa4b46d1f3ce515e50e1825bc /bitbake/lib
parent22e8c6cbd3070d65741a1fd7f05a40373c236a50 (diff)
downloadpoky-a3967e2ba531fbc4880c5efe8f9d1683428297e2.tar.gz
bitbake: bitbake-layers: fix mapping files to layers
bitbake-layers needs to map recipe and class files to the layer they came from within the show-recipes and show-overlayed commands. However, it turns out that mapping a file to the layer it came from is not as trivial as it might seem. To do it properly we need to match the path to an entry in BBFILES then map that to the collection name using BBFILE_PATTERN, then map that to the actual layer using variable history. If it doesn't match any entry in BBFILES, then we can fall back to BBFILE_PATTERN (to handle classes and conf files). This fixes the layer name not showing up properly in the output of the show-recipes and show-overlayed commands for recipes in layers such as meta-intel that have subdirectories in BBFILE_PATTERN. It also fixes the priority not showing up in show-layers for such layers. As part of this I've added a function to VariableHistory which for a space-separated list variable gives you a dict mapping the items added to the files in which they were added. I've also fixed bb.utils.get_file_layer() and reduced some of the duplication by using this function in bitbake-layers. Also fixes the priority not showing up for layers such as meta-intel Fixes [YOCTO #8160]. (Bitbake rev: e852f6cabd7489585477ab567a1afeb2252377ac) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
-rw-r--r--bitbake/lib/bb/data_smart.py25
-rw-r--r--bitbake/lib/bb/utils.py32
2 files changed, 49 insertions, 8 deletions
diff --git a/bitbake/lib/bb/data_smart.py b/bitbake/lib/bb/data_smart.py
index 26f69d105a..75e22f9c45 100644
--- a/bitbake/lib/bb/data_smart.py
+++ b/bitbake/lib/bb/data_smart.py
@@ -312,6 +312,31 @@ class VariableHistory(object):
312 lines.append(line) 312 lines.append(line)
313 return lines 313 return lines
314 314
315 def get_variable_items_files(self, var, d):
316 """
317 Use variable history to map items added to a list variable and
318 the files in which they were added.
319 """
320 history = self.variable(var)
321 finalitems = (d.getVar(var, True) or '').split()
322 filemap = {}
323 isset = False
324 for event in history:
325 if 'flag' in event:
326 continue
327 if event['op'] == '_remove':
328 continue
329 if isset and event['op'] == 'set?':
330 continue
331 isset = True
332 items = d.expand(event['detail']).split()
333 for item in items:
334 # This is a little crude but is belt-and-braces to avoid us
335 # having to handle every possible operation type specifically
336 if item in finalitems and not item in filemap:
337 filemap[item] = event['file']
338 return filemap
339
315 def del_var_history(self, var, f=None, line=None): 340 def del_var_history(self, var, f=None, line=None):
316 """If file f and line are not given, the entire history of var is deleted""" 341 """If file f and line are not given, the entire history of var is deleted"""
317 if var in self.variables: 342 if var in self.variables:
diff --git a/bitbake/lib/bb/utils.py b/bitbake/lib/bb/utils.py
index 607ffc5065..5b94432b37 100644
--- a/bitbake/lib/bb/utils.py
+++ b/bitbake/lib/bb/utils.py
@@ -29,6 +29,7 @@ import multiprocessing
29import fcntl 29import fcntl
30import subprocess 30import subprocess
31import glob 31import glob
32import fnmatch
32import traceback 33import traceback
33import errno 34import errno
34import signal 35import signal
@@ -1262,11 +1263,26 @@ def get_file_layer(filename, d):
1262 for collection in collections: 1263 for collection in collections:
1263 collection_res[collection] = d.getVar('BBFILE_PATTERN_%s' % collection, True) or '' 1264 collection_res[collection] = d.getVar('BBFILE_PATTERN_%s' % collection, True) or ''
1264 1265
1265 # Use longest path so we handle nested layers 1266 def path_to_layer(path):
1266 matchlen = 0 1267 # Use longest path so we handle nested layers
1267 match = None 1268 matchlen = 0
1268 for collection, regex in collection_res.iteritems(): 1269 match = None
1269 if len(regex) > matchlen and re.match(regex, filename): 1270 for collection, regex in collection_res.iteritems():
1270 matchlen = len(regex) 1271 if len(regex) > matchlen and re.match(regex, path):
1271 match = collection 1272 matchlen = len(regex)
1272 return match 1273 match = collection
1274 return match
1275
1276 result = None
1277 bbfiles = (d.getVar('BBFILES', True) or '').split()
1278 bbfilesmatch = False
1279 for bbfilesentry in bbfiles:
1280 if fnmatch.fnmatch(filename, bbfilesentry):
1281 bbfilesmatch = True
1282 result = path_to_layer(bbfilesentry)
1283
1284 if not bbfilesmatch:
1285 # Probably a bbclass
1286 result = path_to_layer(filename)
1287
1288 return result