diff options
author | Jaewon Lee <jaewon.lee@xilinx.com> | 2019-09-19 17:13:29 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-10-08 11:22:24 +0100 |
commit | 41d225f4a37d02e9f79bdbfb79caac8cd3d291ce (patch) | |
tree | 282e21201118ec72a7875abb28f77dc0433b5ff1 /scripts | |
parent | ec6c982949958ee9e461fcd2db9f09c36e68dd5f (diff) | |
download | poky-41d225f4a37d02e9f79bdbfb79caac8cd3d291ce.tar.gz |
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]
(From OE-Core rev: aa94f00eec64ef936acc80dfa826fd309daa294f)
Signed-off-by: Jaewon Lee <jaewon.lee@xilinx.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/lib/devtool/standard.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index 60c9a046f9..1646971a91 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py | |||
@@ -2011,7 +2011,7 @@ def finish(args, config, basepath, workspace): | |||
2011 | no_clean = args.no_clean | 2011 | no_clean = args.no_clean |
2012 | tinfoil = setup_tinfoil(basepath=basepath, tracking=True) | 2012 | tinfoil = setup_tinfoil(basepath=basepath, tracking=True) |
2013 | try: | 2013 | try: |
2014 | rd = parse_recipe(config, tinfoil, args.recipename, True) | 2014 | rd = parse_recipe(config, tinfoil, args.recipename, True, False) |
2015 | if not rd: | 2015 | if not rd: |
2016 | return 1 | 2016 | return 1 |
2017 | 2017 | ||