summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/cooker.py
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2022-11-15 22:06:30 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-11-20 08:31:28 +0000
commit3a4aeda0fa67ae4a2f8c79e83c734b45dde95543 (patch)
treee420d1a34403c3cc956f79d91a633dcd5c56f797 /bitbake/lib/bb/cooker.py
parent16ad67809b9b9cc67dfa863de7605126793f31ae (diff)
downloadpoky-3a4aeda0fa67ae4a2f8c79e83c734b45dde95543.tar.gz
bitbake: cache/cookerdata: Move recipe parsing functions from cache to databuilder
When 'NoCache' was written, databuilder/cookerdata didn't exist. It does now and the recipe parsing functionality contained in NoCache clearly belongs there, it isn't a cache function. Move those functions, renaming to match the style in databuilder but otherwise not changing functionality for now. Fix up the callers to match (which make it clear this is the right move). (Bitbake rev: 783879319c6a4cf3639fcbf763b964e42f602eca) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/cooker.py')
-rw-r--r--bitbake/lib/bb/cooker.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index 1da2f03197..1af29f217d 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -617,8 +617,7 @@ class BBCooker:
617 617
618 if fn: 618 if fn:
619 try: 619 try:
620 bb_caches = bb.cache.MulticonfigCache(self.databuilder, self.data_hash, self.caches_array) 620 envdata = self.databuilder.parseRecipe(fn, self.collections[mc].get_file_appends(fn))
621 envdata = bb_caches[mc].loadDataFull(fn, self.collections[mc].get_file_appends(fn))
622 except Exception as e: 621 except Exception as e:
623 parselog.exception("Unable to read %s", fn) 622 parselog.exception("Unable to read %s", fn)
624 raise 623 raise