aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2020-04-03 13:37:30 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-04-06 16:45:14 +0100
commit4618da2094189e4d814b7d65672cb65c86c0626a (patch)
tree9b4c8356bdb4e1936f7b500644682d2934b617d0
parentf483ee4a869fb1dafbe4bdf2da228cdaa40b38bd (diff)
downloadbitbake-1.46.0.tar.gz
bitbake-1.46.0.tar.bz2
bitbake-1.46.0.zip
tinfoil: Add back ability to parse on top of a datastoreyocto-3.12020-04-dunfell1.46.0
This option was removed recently as we didn't realise the layerindex relies upon it. Add back the API which it turns out can be supported as long as we assume the datastore passed in is a remote datastore which it usually would be unless created locally. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--lib/bb/command.py3
-rw-r--r--lib/bb/tinfoil.py7
2 files changed, 6 insertions, 4 deletions
diff --git a/lib/bb/command.py b/lib/bb/command.py
index 28799509..6abf3866 100644
--- a/lib/bb/command.py
+++ b/lib/bb/command.py
@@ -499,8 +499,7 @@ class CommandsSync:
appends = params[1]
appendlist = params[2]
if len(params) > 3:
- config_data_dict = params[3]
- config_data = command.remotedatastores.receive_datastore(config_data_dict)
+ config_data = command.remotedatastores[params[3]]
else:
config_data = None
diff --git a/lib/bb/tinfoil.py b/lib/bb/tinfoil.py
index 1164ee60..7d53608b 100644
--- a/lib/bb/tinfoil.py
+++ b/lib/bb/tinfoil.py
@@ -617,7 +617,7 @@ class Tinfoil:
fn = self.get_recipe_file(pn)
return self.parse_recipe_file(fn)
- def parse_recipe_file(self, fn, appends=True, appendlist=None):
+ def parse_recipe_file(self, fn, appends=True, appendlist=None, config_data=None):
"""
Parse the specified recipe file (with or without bbappends)
and return a datastore object representing the environment
@@ -635,7 +635,10 @@ class Tinfoil:
try:
if appends and appendlist == []:
appends = False
- dscon = self.run_command('parseRecipeFile', fn, appends, appendlist)
+ if config_data:
+ dscon = self.run_command('parseRecipeFile', fn, appends, appendlist, config_data.dsindex)
+ else:
+ dscon = self.run_command('parseRecipeFile', fn, appends, appendlist)
if dscon:
return self._reconvert_type(dscon, 'DataStoreConnectionHandle')
else: