| Message ID | 20221220072619.104336-1-liezhi.yang@windriver.com |
|---|---|
| State | New |
| Headers | show |
| Series | [layerindex-web] layerindex/utils.py: Add to baseconfig=True for bb.parse.handle() | expand |
On Mon, Dec 19, 2022 at 11:26 PM Robert Yang <liezhi.yang@windriver.com> wrote: > 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' > > Merged. Thank you! > Signed-off-by: Robert Yang <liezhi.yang@windriver.com> > --- > <snip> > -- > 2.37.1 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#58837): > https://lists.yoctoproject.org/g/yocto/message/58837 > Mute This Topic: https://lists.yoctoproject.org/mt/95781944/924729 > Group Owner: yocto+owner@lists.yoctoproject.org > Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [ > ticotimo@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- > >
On 12/21/22 00:39, Tim Orling wrote: > > > On Mon, Dec 19, 2022 at 11:26 PM Robert Yang <liezhi.yang@windriver.com > <mailto:liezhi.yang@windriver.com>> wrote: > > 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' > > Merged. Thank you! Glad to see that layerindex is back to active. I've also sent you another 3 patches just now: utils.py: Prefer the one which matches branchname for depends layer recipeparse.py: Checkout deplayerbranch before parsing util.py: Fix for removing non-existed dependencies I think that I had sent them before, but not get merged, layerindex may not work well without these fixes. // Robert > > Signed-off-by: Robert Yang <liezhi.yang@windriver.com > <mailto:liezhi.yang@windriver.com>> > --- > <snip> > -- > 2.37.1 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#58837): > https://lists.yoctoproject.org/g/yocto/message/58837 > <https://urldefense.com/v3/__https://lists.yoctoproject.org/g/yocto/message/58837__;!!AjveYdw8EvQ!f82pFsZIjTXfpv3B6LSr7x_5u225kNcUYM4LAUVvBu-7OS0E-2XR9CWbMzZvGBQ8fAk7X9lL9YGOQelM8Imvyw$> > Mute This Topic: https://lists.yoctoproject.org/mt/95781944/924729 > <https://urldefense.com/v3/__https://lists.yoctoproject.org/mt/95781944/924729__;!!AjveYdw8EvQ!f82pFsZIjTXfpv3B6LSr7x_5u225kNcUYM4LAUVvBu-7OS0E-2XR9CWbMzZvGBQ8fAk7X9lL9YGOQekkj_SwmA$> > Group Owner: yocto+owner@lists.yoctoproject.org > <mailto:yocto%2Bowner@lists.yoctoproject.org> > Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub > <https://urldefense.com/v3/__https://lists.yoctoproject.org/g/yocto/unsub__;!!AjveYdw8EvQ!f82pFsZIjTXfpv3B6LSr7x_5u225kNcUYM4LAUVvBu-7OS0E-2XR9CWbMzZvGBQ8fAk7X9lL9YGOQekx9xA53A$> [ticotimo@gmail.com <mailto:ticotimo@gmail.com>] > -=-=-=-=-=-=-=-=-=-=-=- >
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)
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 <liezhi.yang@windriver.com> --- layerindex/utils.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)