[oe-commits] [openembedded-core] 03/14: devtool/standard.py: Not filtering devtool workspace for devtool finish

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit aa94f00eec64ef936acc80dfa826fd309daa294f
Author: Jaewon Lee <jaewon.lee at xilinx.com>
AuthorDate: Thu Sep 19 17:13:29 2019 -0700

    devtool/standard.py: Not filtering devtool workspace for devtool finish
    
    All devtool commands right now are filtering out the devtool workspace
    bbappends in build/workspace/appends when calling parse_recipe. While
    this may make sense for devtool add and modify, we need devtool finish
    to include those appends.
    
    A specific breakage that is caused because devtool finish filters devtool
    appends is the cmake/cml1 flow where a file is created in the WORKDIR
    that finish needs access to, to commit those files. Particularly for
    git packages with SRCPV in PV, SRCPV is only changed to 999 when using
    external source, hence when creating the cfg or cmake config files using
    for instance bitbake -c diffconfig, these files are created in the
    git999 workdir correctly (as in the devtool bbapends, we are inheriting
    externalsrc class). But when devtool finish is run, the devtool appends
    are not parsed, hence SRCPV is not changed to 999 and devtool is looking
    for the fragment files in the wrong WORKDIR.
    
    Changing the parse_recipe call just in devtool finish to not filter out
    the devtool workspace.
    
    Fixes [YOCTO #13533]
    
    Signed-off-by: Jaewon Lee <jaewon.lee at xilinx.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 scripts/lib/devtool/standard.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index 60c9a04..1646971 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -2011,7 +2011,7 @@ def finish(args, config, basepath, workspace):
     no_clean = args.no_clean
     tinfoil = setup_tinfoil(basepath=basepath, tracking=True)
     try:
-        rd = parse_recipe(config, tinfoil, args.recipename, True)
+        rd = parse_recipe(config, tinfoil, args.recipename, True, False)
         if not rd:
             return 1
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.