summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bblayers
diff options
context:
space:
mode:
authorJoshua Lock <joshua.g.lock@intel.com>2016-11-25 15:28:08 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-11-30 15:48:09 (GMT)
commit1fce7ecbbb004a5ad82da3eef79cfd52b276708d (patch)
treedc19c8ecb8e0b04ba5eafd27a7679bb55585a868 /bitbake/lib/bblayers
parent1d0c124cdf0282b8d139063409e40982f0ec9888 (diff)
downloadpoky-1fce7ecbbb004a5ad82da3eef79cfd52b276708d.tar.gz
bitbake: bitbake: remove True option to getVar calls
getVar() now defaults to expanding by default, thus remove the True option from getVar() calls with a regex search and replace. Search made with the following regex: getVar ?\(( ?[^,()]*), True\) (Bitbake rev: 3b45c479de8640f92dd1d9f147b02e1eecfaadc8) Signed-off-by: Joshua Lock <joshua.g.lock@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bblayers')
-rw-r--r--bitbake/lib/bblayers/action.py2
-rw-r--r--bitbake/lib/bblayers/common.py2
-rw-r--r--bitbake/lib/bblayers/layerindex.py8
-rw-r--r--bitbake/lib/bblayers/query.py10
4 files changed, 11 insertions, 11 deletions
diff --git a/bitbake/lib/bblayers/action.py b/bitbake/lib/bblayers/action.py
index 739ae27..cf94704 100644
--- a/bitbake/lib/bblayers/action.py
+++ b/bitbake/lib/bblayers/action.py
@@ -180,7 +180,7 @@ build results (as the layer priority order has effectively changed).
180 180
181 if first_regex: 181 if first_regex:
182 # Find the BBFILES entries that match (which will have come from this conf/layer.conf file) 182 # Find the BBFILES entries that match (which will have come from this conf/layer.conf file)
183 bbfiles = str(self.tinfoil.config_data.getVar('BBFILES', True)).split() 183 bbfiles = str(self.tinfoil.config_data.getVar('BBFILES')).split()
184 bbfiles_layer = [] 184 bbfiles_layer = []
185 for item in bbfiles: 185 for item in bbfiles:
186 if first_regex.match(item): 186 if first_regex.match(item):
diff --git a/bitbake/lib/bblayers/common.py b/bitbake/lib/bblayers/common.py
index b10fb4c..98515ce 100644
--- a/bitbake/lib/bblayers/common.py
+++ b/bitbake/lib/bblayers/common.py
@@ -12,7 +12,7 @@ class LayerPlugin():
12 12
13 def tinfoil_init(self, tinfoil): 13 def tinfoil_init(self, tinfoil):
14 self.tinfoil = tinfoil 14 self.tinfoil = tinfoil
15 self.bblayers = (self.tinfoil.config_data.getVar('BBLAYERS', True) or "").split() 15 self.bblayers = (self.tinfoil.config_data.getVar('BBLAYERS') or "").split()
16 layerconfs = self.tinfoil.config_data.varhistory.get_variable_items_files('BBFILE_COLLECTIONS', self.tinfoil.config_data) 16 layerconfs = self.tinfoil.config_data.varhistory.get_variable_items_files('BBFILE_COLLECTIONS', self.tinfoil.config_data)
17 self.bbfile_collections = {layer: os.path.dirname(os.path.dirname(path)) for layer, path in layerconfs.items()} 17 self.bbfile_collections = {layer: os.path.dirname(os.path.dirname(path)) for layer, path in layerconfs.items()}
18 18
diff --git a/bitbake/lib/bblayers/layerindex.py b/bitbake/lib/bblayers/layerindex.py
index 10ad718..013e952 100644
--- a/bitbake/lib/bblayers/layerindex.py
+++ b/bitbake/lib/bblayers/layerindex.py
@@ -151,7 +151,7 @@ class LayerIndexPlugin(ActionPlugin):
151 def do_layerindex_fetch(self, args): 151 def do_layerindex_fetch(self, args):
152 """Fetches a layer from a layer index along with its dependent layers, and adds them to conf/bblayers.conf. 152 """Fetches a layer from a layer index along with its dependent layers, and adds them to conf/bblayers.conf.
153""" 153"""
154 apiurl = self.tinfoil.config_data.getVar('BBLAYERS_LAYERINDEX_URL', True) 154 apiurl = self.tinfoil.config_data.getVar('BBLAYERS_LAYERINDEX_URL')
155 if not apiurl: 155 if not apiurl:
156 logger.error("Cannot get BBLAYERS_LAYERINDEX_URL") 156 logger.error("Cannot get BBLAYERS_LAYERINDEX_URL")
157 return 1 157 return 1
@@ -173,8 +173,8 @@ class LayerIndexPlugin(ActionPlugin):
173 return 1 173 return 1
174 174
175 ignore_layers = [] 175 ignore_layers = []
176 for collection in self.tinfoil.config_data.getVar('BBFILE_COLLECTIONS', True).split(): 176 for collection in self.tinfoil.config_data.getVar('BBFILE_COLLECTIONS').split():
177 lname = self.tinfoil.config_data.getVar('BBLAYERS_LAYERINDEX_NAME_%s' % collection, True) 177 lname = self.tinfoil.config_data.getVar('BBLAYERS_LAYERINDEX_NAME_%s' % collection)
178 if lname: 178 if lname:
179 ignore_layers.append(lname) 179 ignore_layers.append(lname)
180 180
@@ -225,7 +225,7 @@ class LayerIndexPlugin(ActionPlugin):
225 printedlayers.append(dependency) 225 printedlayers.append(dependency)
226 226
227 if repourls: 227 if repourls:
228 fetchdir = self.tinfoil.config_data.getVar('BBLAYERS_FETCH_DIR', True) 228 fetchdir = self.tinfoil.config_data.getVar('BBLAYERS_FETCH_DIR')
229 if not fetchdir: 229 if not fetchdir:
230 logger.error("Cannot get BBLAYERS_FETCH_DIR") 230 logger.error("Cannot get BBLAYERS_FETCH_DIR")
231 return 1 231 return 1
diff --git a/bitbake/lib/bblayers/query.py b/bitbake/lib/bblayers/query.py
index ee1e7c8..2949116 100644
--- a/bitbake/lib/bblayers/query.py
+++ b/bitbake/lib/bblayers/query.py
@@ -62,7 +62,7 @@ are overlayed will also be listed, with a " (skipped)" suffix.
62 # factor - however, each layer.conf is free to either prepend or append to 62 # factor - however, each layer.conf is free to either prepend or append to
63 # BBPATH (or indeed do crazy stuff with it). Thus the order in BBPATH might 63 # BBPATH (or indeed do crazy stuff with it). Thus the order in BBPATH might
64 # not be exactly the order present in bblayers.conf either. 64 # not be exactly the order present in bblayers.conf either.
65 bbpath = str(self.tinfoil.config_data.getVar('BBPATH', True)) 65 bbpath = str(self.tinfoil.config_data.getVar('BBPATH'))
66 overlayed_class_found = False 66 overlayed_class_found = False
67 for (classfile, classdirs) in classes.items(): 67 for (classfile, classdirs) in classes.items():
68 if len(classdirs) > 1: 68 if len(classdirs) > 1:
@@ -114,7 +114,7 @@ skipped recipes will also be listed, with a " (skipped)" suffix.
114 114
115 def list_recipes(self, title, pnspec, show_overlayed_only, show_same_ver_only, show_filenames, show_multi_provider_only, inherits): 115 def list_recipes(self, title, pnspec, show_overlayed_only, show_same_ver_only, show_filenames, show_multi_provider_only, inherits):
116 if inherits: 116 if inherits:
117 bbpath = str(self.tinfoil.config_data.getVar('BBPATH', True)) 117 bbpath = str(self.tinfoil.config_data.getVar('BBPATH'))
118 for classname in inherits: 118 for classname in inherits:
119 classfile = 'classes/%s.bbclass' % classname 119 classfile = 'classes/%s.bbclass' % classname
120 if not bb.utils.which(bbpath, classfile, history=False): 120 if not bb.utils.which(bbpath, classfile, history=False):
@@ -158,7 +158,7 @@ skipped recipes will also be listed, with a " (skipped)" suffix.
158 logger.plain("%s:", pn) 158 logger.plain("%s:", pn)
159 logger.plain(" %s %s%s", layer.ljust(20), ver, skipped) 159 logger.plain(" %s %s%s", layer.ljust(20), ver, skipped)
160 160
161 global_inherit = (self.tinfoil.config_data.getVar('INHERIT', True) or "").split() 161 global_inherit = (self.tinfoil.config_data.getVar('INHERIT') or "").split()
162 cls_re = re.compile('classes/') 162 cls_re = re.compile('classes/')
163 163
164 preffiles = [] 164 preffiles = []
@@ -319,12 +319,12 @@ NOTE: .bbappend files can impact the dependencies.
319 ignore_layers = (args.ignore or '').split(',') 319 ignore_layers = (args.ignore or '').split(',')
320 320
321 pkg_fn = self.tinfoil.cooker_data.pkg_fn 321 pkg_fn = self.tinfoil.cooker_data.pkg_fn
322 bbpath = str(self.tinfoil.config_data.getVar('BBPATH', True)) 322 bbpath = str(self.tinfoil.config_data.getVar('BBPATH'))
323 self.require_re = re.compile(r"require\s+(.+)") 323 self.require_re = re.compile(r"require\s+(.+)")
324 self.include_re = re.compile(r"include\s+(.+)") 324 self.include_re = re.compile(r"include\s+(.+)")
325 self.inherit_re = re.compile(r"inherit\s+(.+)") 325 self.inherit_re = re.compile(r"inherit\s+(.+)")
326 326
327 global_inherit = (self.tinfoil.config_data.getVar('INHERIT', True) or "").split() 327 global_inherit = (self.tinfoil.config_data.getVar('INHERIT') or "").split()
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: