summaryrefslogtreecommitdiffstats
path: root/bitbake
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-24 22:01:03 +0000
commitc0e79ee2e93609d4a647b31afed6dc034d893a52 (patch)
tree20c784a4cca8515117dd5bc997a3cc0250b5b5e2 /bitbake
parentd5db9d12642e03a1d5cca5f1520dad5fcc9524c3 (diff)
downloadpoky-c0e79ee2e93609d4a647b31afed6dc034d893a52.tar.gz
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 <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/tinfoil.py11
1 files changed, 2 insertions, 9 deletions
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:
615 fn = self.get_recipe_file(pn) 615 fn = self.get_recipe_file(pn)
616 return self.parse_recipe_file(fn) 616 return self.parse_recipe_file(fn)
617 617
618 def parse_recipe_file(self, fn, appends=True, appendlist=None, config_data=None): 618 def parse_recipe_file(self, fn, appends=True, appendlist=None):
619 """ 619 """
620 Parse the specified recipe file (with or without bbappends) 620 Parse the specified recipe file (with or without bbappends)
621 and return a datastore object representing the environment 621 and return a datastore object representing the environment
@@ -626,9 +626,6 @@ class Tinfoil:
626 appends: True to apply bbappends, False otherwise 626 appends: True to apply bbappends, False otherwise
627 appendlist: optional list of bbappend files to apply, if you 627 appendlist: optional list of bbappend files to apply, if you
628 want to filter them 628 want to filter them
629 config_data: custom config datastore to use. NOTE: if you
630 specify config_data then you cannot use a virtual
631 specification for fn.
632 """ 629 """
633 if self.tracking: 630 if self.tracking:
634 # Enable history tracking just for the parse operation 631 # Enable history tracking just for the parse operation
@@ -636,11 +633,7 @@ class Tinfoil:
636 try: 633 try:
637 if appends and appendlist == []: 634 if appends and appendlist == []:
638 appends = False 635 appends = False
639 if config_data: 636 dscon = self.run_command('parseRecipeFile', fn, appends, appendlist)
640 dctr = bb.remotedata.RemoteDatastores.transmit_datastore(config_data)
641 dscon = self.run_command('parseRecipeFile', fn, appends, appendlist, dctr)
642 else:
643 dscon = self.run_command('parseRecipeFile', fn, appends, appendlist)
644 if dscon: 637 if dscon:
645 return self._reconvert_type(dscon, 'DataStoreConnectionHandle') 638 return self._reconvert_type(dscon, 'DataStoreConnectionHandle')
646 else: 639 else: