From 5976f9fc68ccd1fc4b51b7f5fbf14ab3df8143fe Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Mon, 19 Dec 2022 23:26:19 -0800 Subject: [PATCH] layerindex/utils.py: Add to baseconfig=True for bb.parse.handle() Bitbake's api has been changed via: afb8478d3 parse: Add support for addpylib conf file directive and BB_GLOBAL_PYMODULES The conf file won't be parsed without baseconfig=True: bb.parse.ParseError: ParseError at /path/to/oe-core/meta/conf/layer.conf:132: unparsed line: 'addpylib ${LAYERDIR}/lib oe' Signed-off-by: Robert Yang Signed-off-by: Tim Orling --- layerindex/utils.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/layerindex/utils.py b/layerindex/utils.py index 6566710..9d94015 100644 --- a/layerindex/utils.py +++ b/layerindex/utils.py @@ -314,7 +314,10 @@ def is_branch_valid(layerdir, branch): def parse_conf(conf_file, d): if hasattr(bb.parse, "handle"): # Newer BitBake - data = bb.parse.handle(conf_file, d, include=True) + if hasattr(bb.parse.parse_py.ConfHandler, "__addpylib_regexp__"): + data = bb.parse.handle(conf_file, d, include=True, baseconfig=True) + else: + data = bb.parse.handle(conf_file, d, include=True) else: # Older BitBake (1.18 and below) data = bb.cooker._parse(conf_file, d)