diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-03-23 13:21:35 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-03-23 16:28:37 +0000 |
| commit | af1654498ee5b47368a41dad2d2b7b6abc19ff15 (patch) | |
| tree | 839ffdb5723b6647e9bd5fd0c3903104bdc3ed1c | |
| parent | f2341dc46b6abfc08a4d01c7abdd3d4630577999 (diff) | |
| download | bitbake-af1654498ee5b47368a41dad2d2b7b6abc19ff15.tar.gz | |
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.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | lib/bb/data_smart.py | 3 | ||||
| -rw-r--r-- | lib/bblayers/common.py | 2 | ||||
| -rw-r--r-- | lib/layerindexlib/cooker.py | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/lib/bb/data_smart.py b/lib/bb/data_smart.py index 63a32bc6a..b2dc9d9fd 100644 --- a/lib/bb/data_smart.py +++ b/lib/bb/data_smart.py @@ -338,11 +338,12 @@ class VariableHistory(object): lines.append(line) return lines - def get_variable_items_files(self, var, d): + def get_variable_items_files(self, var): """ Use variable history to map items added to a list variable and the files in which they were added. """ + d = self.dataroot history = self.variable(var) finalitems = (d.getVar(var) or '').split() filemap = {} diff --git a/lib/bblayers/common.py b/lib/bblayers/common.py index c5657d381..6c76ef350 100644 --- a/lib/bblayers/common.py +++ b/lib/bblayers/common.py @@ -17,7 +17,7 @@ class LayerPlugin(): def tinfoil_init(self, tinfoil): self.tinfoil = tinfoil self.bblayers = (self.tinfoil.config_data.getVar('BBLAYERS') or "").split() - layerconfs = self.tinfoil.config_data.varhistory.get_variable_items_files('BBFILE_COLLECTIONS', self.tinfoil.config_data) + layerconfs = self.tinfoil.config_data.varhistory.get_variable_items_files('BBFILE_COLLECTIONS') self.bbfile_collections = {layer: os.path.dirname(os.path.dirname(path)) for layer, path in layerconfs.items()} @staticmethod diff --git a/lib/layerindexlib/cooker.py b/lib/layerindexlib/cooker.py index 4ce397d88..65b23d087 100644 --- a/lib/layerindexlib/cooker.py +++ b/lib/layerindexlib/cooker.py @@ -93,7 +93,7 @@ class CookerPlugin(layerindexlib.plugin.IndexPlugin): return index collections = d.getVar('BBFILE_COLLECTIONS') - layerconfs = d.varhistory.get_variable_items_files('BBFILE_COLLECTIONS', d) + layerconfs = d.varhistory.get_variable_items_files('BBFILE_COLLECTIONS') bbfile_collections = {layer: os.path.dirname(os.path.dirname(path)) for layer, path in layerconfs.items()} (_, bb_branch, _, _) = self._get_bitbake_info() |