summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/command.py
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake/lib/bb/command.py')
-rw-r--r--bitbake/lib/bb/command.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/bitbake/lib/bb/command.py b/bitbake/lib/bb/command.py
index 9e2cdc5c75..a355f56c60 100644
--- a/bitbake/lib/bb/command.py
+++ b/bitbake/lib/bb/command.py
@@ -561,6 +561,7 @@ class CommandsSync:
561 appendfiles = command.cooker.collections[mc].get_file_appends(fn) 561 appendfiles = command.cooker.collections[mc].get_file_appends(fn)
562 else: 562 else:
563 appendfiles = [] 563 appendfiles = []
564 layername = command.cooker.collections[mc].calc_bbfile_priority(fn)[2]
564 # We are calling bb.cache locally here rather than on the server, 565 # We are calling bb.cache locally here rather than on the server,
565 # but that's OK because it doesn't actually need anything from 566 # but that's OK because it doesn't actually need anything from
566 # the server barring the global datastore (which we have a remote 567 # the server barring the global datastore (which we have a remote
@@ -568,10 +569,10 @@ class CommandsSync:
568 if config_data: 569 if config_data:
569 # We have to use a different function here if we're passing in a datastore 570 # We have to use a different function here if we're passing in a datastore
570 # NOTE: we took a copy above, so we don't do it here again 571 # NOTE: we took a copy above, so we don't do it here again
571 envdata = command.cooker.databuilder._parse_recipe(config_data, fn, appendfiles, mc)[''] 572 envdata = command.cooker.databuilder._parse_recipe(config_data, fn, appendfiles, mc, layername)['']
572 else: 573 else:
573 # Use the standard path 574 # Use the standard path
574 envdata = command.cooker.databuilder.parseRecipe(fn, appendfiles) 575 envdata = command.cooker.databuilder.parseRecipe(fn, appendfiles, layername)
575 idx = command.remotedatastores.store(envdata) 576 idx = command.remotedatastores.store(envdata)
576 return DataStoreConnectionHandle(idx) 577 return DataStoreConnectionHandle(idx)
577 parseRecipeFile.readonly = True 578 parseRecipeFile.readonly = True