<div dir="ltr"><div>Unfortunately this broke 'devtool upgrade' functionality, where 'devtool finish' erroneously rewrites SRC_URI to no longer include the path to the remote tarball.</div><div><br></div><div>I will have to send a revert for this.</div><div><br></div><div>Alex<br></div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Thu, 3 Oct 2019 at 01:10, Jaewon Lee <<a href="mailto:JAEWON@xilinx.com">JAEWON@xilinx.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">ping<br>
<br>
> -----Original Message-----<br>
> From: Jaewon Lee <<a href="mailto:jaewon.lee@xilinx.com" target="_blank">jaewon.lee@xilinx.com</a>><br>
> Sent: Thursday, September 19, 2019 5:13 PM<br>
> To: <a href="mailto:openembedded-core@lists.openembedded.org" target="_blank">openembedded-core@lists.openembedded.org</a>;<br>
> <a href="mailto:paul.eggleton@linux.intel.com" target="_blank">paul.eggleton@linux.intel.com</a>; Manjukumar Harthikote Matha<br>
> <<a href="mailto:MANJUKUM@xilinx.com" target="_blank">MANJUKUM@xilinx.com</a>>; Alejandro Enedino Hernandez Samaniego<br>
> <<a href="mailto:alejandr@xilinx.com" target="_blank">alejandr@xilinx.com</a>><br>
> Cc: Jaewon Lee <<a href="mailto:JAEWON@xilinx.com" target="_blank">JAEWON@xilinx.com</a>><br>
> Subject: [OE-core][master][PATCH] standard.py: Not filtering devtool<br>
> workspace for devtool finish<br>
> <br>
> All devtool commands right now are filtering out the devtool workspace<br>
> bbappends in build/workspace/appends when calling parse_recipe. While<br>
> this may make sense for devtool add and modify, we need devtool finish to<br>
> include those appends.<br>
> <br>
> A specific breakage that is caused because devtool finish filters devtool<br>
> appends is the cmake/cml1 flow where a file is created in the WORKDIR that<br>
> finish needs access to, to commit those files. Particularly for git packages with<br>
> SRCPV in PV, SRCPV is only changed to 999 when using external source,<br>
> hence when creating the cfg or cmake config files using for instance bitbake -<br>
> c diffconfig, these files are created in the<br>
> git999 workdir correctly (as in the devtool bbapends, we are inheriting<br>
> externalsrc class). But when devtool finish is run, the devtool appends are<br>
> not parsed, hence SRCPV is not changed to 999 and devtool is looking for the<br>
> fragment files in the wrong WORKDIR.<br>
> <br>
> Changing the parse_recipe call just in devtool finish to not filter out the<br>
> devtool workspace.<br>
> <br>
> Fixes [YOCTO #13533]<br>
> <br>
> Signed-off-by: Jaewon Lee <<a href="mailto:jaewon.lee@xilinx.com" target="_blank">jaewon.lee@xilinx.com</a>><br>
> ---<br>
> scripts/lib/devtool/standard.py | 2 +-<br>
> 1 file changed, 1 insertion(+), 1 deletion(-)<br>
> <br>
> diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py<br>
> index 9eeaefb..e87b433 100644<br>
> --- a/scripts/lib/devtool/standard.py<br>
> +++ b/scripts/lib/devtool/standard.py<br>
> @@ -2011,7 +2011,7 @@ def finish(args, config, basepath, workspace):<br>
> no_clean = False<br>
> tinfoil = setup_tinfoil(basepath=basepath, tracking=True)<br>
> try:<br>
> - rd = parse_recipe(config, tinfoil, args.recipename, True)<br>
> + rd = parse_recipe(config, tinfoil, args.recipename, True,<br>
> + False)<br>
> if not rd:<br>
> return 1<br>
> <br>
> --<br>
> 2.7.4<br>
<br>
-- <br>
_______________________________________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org" target="_blank">Openembedded-core@lists.openembedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/mailman/listinfo/openembedded-core</a><br>
</blockquote></div>