diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-11-15 22:06:30 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-11-16 00:05:45 +0000 |
| commit | 783879319c6a4cf3639fcbf763b964e42f602eca (patch) | |
| tree | 874890e8ad75680903901e5cf33ee387bb5b491a /bin | |
| parent | 58e29fb15cd65795d6cf65a4db2b87f34649cb1f (diff) | |
| download | bitbake-783879319c6a4cf3639fcbf763b964e42f602eca.tar.gz | |
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).
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/bitbake-worker | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/bin/bitbake-worker b/bin/bitbake-worker index 7be39370b..d54044f36 100755 --- a/bin/bitbake-worker +++ b/bin/bitbake-worker @@ -238,7 +238,6 @@ def fork_off_task(cfg, data, databuilder, workerdata, fn, task, taskname, taskha os.umask(umask) try: - bb_cache = bb.cache.NoCache(databuilder) (realfn, virtual, mc) = bb.cache.virtualfn2realfn(fn) the_data = databuilder.mcdata[mc] the_data.setVar("BB_WORKERCONTEXT", "1") @@ -257,7 +256,7 @@ def fork_off_task(cfg, data, databuilder, workerdata, fn, task, taskname, taskha bb.parse.siggen.set_taskhashes(workerdata["newhashes"]) ret = 0 - the_data = bb_cache.loadDataFull(fn, appends) + the_data = databuilder.parseRecipe(fn, appends) the_data.setVar('BB_TASKHASH', taskhash) the_data.setVar('BB_UNIHASH', unihash) |