summaryrefslogtreecommitdiffstats
path: root/bitbake/lib
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2020-03-23 13:21:35 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-03-24 22:01:03 (GMT)
commit89705a60f3b566743703c3a7597ccc4507293dd9 (patch)
tree7278acffd1e3599710084be58c7045ab8f5c6646 /bitbake/lib
parentc0e79ee2e93609d4a647b31afed6dc034d893a52 (diff)
downloadpoky-89705a60f3b566743703c3a7597ccc4507293dd9.tar.gz
bitbake: data_smart: Don't pass unneeded datastore
The datastore is already available to this function internally so don't also try and pass the datastore as a parameter. This is clearly broken API when you look at the existing calls to it. This then doesn't break the planned tinfoil data connector changes. (Bitbake rev: af1654498ee5b47368a41dad2d2b7b6abc19ff15) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
-rw-r--r--bitbake/lib/bb/data_smart.py3
-rw-r--r--bitbake/lib/bblayers/common.py2
-rw-r--r--bitbake/lib/layerindexlib/cooker.py2
3 files changed, 4 insertions, 3 deletions
diff --git a/bitbake/lib/bb/data_smart.py b/bitbake/lib/bb/data_smart.py
index 63a32bc..b2dc9d9 100644
--- a/bitbake/lib/bb/data_smart.py
+++ b/bitbake/lib/bb/data_smart.py
@@ -338,11 +338,12 @@ class VariableHistory(object):
338 lines.append(line) 338 lines.append(line)
339 return lines 339 return lines
340 340
341 def get_variable_items_files(self, var, d): 341 def get_variable_items_files(self, var):
342 """ 342 """
343 Use variable history to map items added to a list variable and 343 Use variable history to map items added to a list variable and
344 the files in which they were added. 344 the files in which they were added.
345 """ 345 """
346 d = self.dataroot
346 history = self.variable(var) 347 history = self.variable(var)
347 finalitems = (d.getVar(var) or '').split() 348 finalitems = (d.getVar(var) or '').split()
348 filemap = {} 349 filemap = {}
diff --git a/bitbake/lib/bblayers/common.py b/bitbake/lib/bblayers/common.py
index c5657d3..6c76ef3 100644
--- a/bitbake/lib/bblayers/common.py
+++ b/bitbake/lib/bblayers/common.py
@@ -17,7 +17,7 @@ class LayerPlugin():
17 def tinfoil_init(self, tinfoil): 17 def tinfoil_init(self, tinfoil):
18 self.tinfoil = tinfoil 18 self.tinfoil = tinfoil
19 self.bblayers = (self.tinfoil.config_data.getVar('BBLAYERS') or "").split() 19 self.bblayers = (self.tinfoil.config_data.getVar('BBLAYERS') or "").split()
20 layerconfs = self.tinfoil.config_data.varhistory.get_variable_items_files('BBFILE_COLLECTIONS', self.tinfoil.config_data) 20 layerconfs = self.tinfoil.config_data.varhistory.get_variable_items_files('BBFILE_COLLECTIONS')
21 self.bbfile_collections = {layer: os.path.dirname(os.path.dirname(path)) for layer, path in layerconfs.items()} 21 self.bbfile_collections = {layer: os.path.dirname(os.path.dirname(path)) for layer, path in layerconfs.items()}
22 22
23 @staticmethod 23 @staticmethod
diff --git a/bitbake/lib/layerindexlib/cooker.py b/bitbake/lib/layerindexlib/cooker.py
index 4ce397d..65b23d0 100644
--- a/bitbake/lib/layerindexlib/cooker.py
+++ b/bitbake/lib/layerindexlib/cooker.py
@@ -93,7 +93,7 @@ class CookerPlugin(layerindexlib.plugin.IndexPlugin):
93 return index 93 return index
94 94
95 collections = d.getVar('BBFILE_COLLECTIONS') 95 collections = d.getVar('BBFILE_COLLECTIONS')
96 layerconfs = d.varhistory.get_variable_items_files('BBFILE_COLLECTIONS', d) 96 layerconfs = d.varhistory.get_variable_items_files('BBFILE_COLLECTIONS')
97 bbfile_collections = {layer: os.path.dirname(os.path.dirname(path)) for layer, path in layerconfs.items()} 97 bbfile_collections = {layer: os.path.dirname(os.path.dirname(path)) for layer, path in layerconfs.items()}
98 98
99 (_, bb_branch, _, _) = self._get_bitbake_info() 99 (_, bb_branch, _, _) = self._get_bitbake_info()