From c0e79ee2e93609d4a647b31afed6dc034d893a52 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 23 Mar 2020 12:30:04 +0000 Subject: bitbake: 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. (Bitbake rev: f2341dc46b6abfc08a4d01c7abdd3d4630577999) Signed-off-by: Richard Purdie --- bitbake/lib/bb/tinfoil.py | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'bitbake') diff --git a/bitbake/lib/bb/tinfoil.py b/bitbake/lib/bb/tinfoil.py index a8e835d29c..70b381e351 100644 --- a/bitbake/lib/bb/tinfoil.py +++ b/bitbake/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: -- cgit v1.2.3-54-g00ecf