summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2020-03-23 12:30:04 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-03-23 16:16:58 +0000
commitf2341dc46b6abfc08a4d01c7abdd3d4630577999 (patch)
tree580eca4282830bbab1094a3cc5664b3b38a65eb2
parent4780df48d5998d619dc36b699400e344187fc134 (diff)
downloadbitbake-f2341dc46b6abfc08a4d01c7abdd3d4630577999.tar.gz
tinfoil: Drop parse_recipe_file custom datastore support
This parameter is unused except for a single selftest and is problematic with regard to fixing some other bugs. Remove it for now, if really needed we could re-implement it in some other way in the future. Experience tells us we likely don't want to support this kind of change to the metadata anyway as its not as useful as it first sounds/appears. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--lib/bb/tinfoil.py11
1 files changed, 2 insertions, 9 deletions
diff --git a/lib/bb/tinfoil.py b/lib/bb/tinfoil.py
index a8e835d29..70b381e35 100644
--- a/lib/bb/tinfoil.py
+++ b/lib/bb/tinfoil.py
@@ -615,7 +615,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, config_data=None):
+ def parse_recipe_file(self, fn, appends=True, appendlist=None):
"""
Parse the specified recipe file (with or without bbappends)
and return a datastore object representing the environment
@@ -626,9 +626,6 @@ class Tinfoil:
appends: True to apply bbappends, False otherwise
appendlist: optional list of bbappend files to apply, if you
want to filter them
- config_data: custom config datastore to use. NOTE: if you
- specify config_data then you cannot use a virtual
- specification for fn.
"""
if self.tracking:
# Enable history tracking just for the parse operation
@@ -636,11 +633,7 @@ class Tinfoil:
try:
if appends and appendlist == []:
appends = False
- if config_data:
- dctr = bb.remotedata.RemoteDatastores.transmit_datastore(config_data)
- dscon = self.run_command('parseRecipeFile', fn, appends, appendlist, dctr)
- else:
- dscon = self.run_command('parseRecipeFile', fn, appends, appendlist)
+ dscon = self.run_command('parseRecipeFile', fn, appends, appendlist)
if dscon:
return self._reconvert_type(dscon, 'DataStoreConnectionHandle')
else: