[yocto] [PATCH V3 03/11] update_layer.py: set layerbranch's collection before add_dependencies
Robert Yang
liezhi.yang at windriver.com
Thu Jun 1 23:28:40 PDT 2017
The _add_dependency() uses:
if layerbranch.collection:
var_name = layerbranch.collection
The layerbranch.collection is none if it is newly created, thus it can't get
LAYERDEPENDS, because what defined in layer.conf is LAYERDEPENDS_<collection>,
but what it would get is LAYERDEPENDS_<layer_name>, this patch can fix the
problem.
Reproducer:
$ python3 update_layer.py -l mete-xfce -b <newbranch> --fullreload -d
It would get None LAYERDEPENDS.
Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
---
layerindex/update_layer.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/layerindex/update_layer.py b/layerindex/update_layer.py
index 05ab3e7..bcf7056 100644
--- a/layerindex/update_layer.py
+++ b/layerindex/update_layer.py
@@ -360,9 +360,9 @@ def main():
logger.info("Skipping update of layer %s for branch %s - conf/layer.conf may have parse issues" % (layer.name, branchdesc))
layerconfparser.shutdown()
sys.exit(1)
+ utils.set_layerbranch_collection_version(layerbranch, layer_config_data, logger=logger)
utils.add_dependencies(layerbranch, layer_config_data, logger=logger)
utils.add_recommends(layerbranch, layer_config_data, logger=logger)
- utils.set_layerbranch_collection_version(layerbranch, layer_config_data, logger=logger)
layerbranch.save()
try:
--
2.10.2
More information about the yocto
mailing list