[master][PATCH] standard.py: Not filtering devtool workspace for devtool finish

[master][PATCH] standard.py: Not filtering devtool workspace for devtool finish

[Jaewon Lee]

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@xilinx.com>
---
 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 9eeaefb..e87b433 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 = False
     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
 
-- 
2.7.4

Re: [master][PATCH] standard.py: Not filtering devtool workspace for devtool finish

[Jaewon Lee]

ping

> -----Original Message-----
> From: Jaewon Lee <jaewon.lee@xilinx.com>
> Sent: Thursday, September 19, 2019 5:13 PM
> To: openembedded-core@lists.openembedded.org;
> paul.eggleton@linux.intel.com; Manjukumar Harthikote Matha
> <MANJUKUM@xilinx.com>; Alejandro Enedino Hernandez Samaniego
> <alejandr@xilinx.com>
> Cc: Jaewon Lee <JAEWON@xilinx.com>
> Subject: [OE-core][master][PATCH] 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@xilinx.com>
> ---
>  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 9eeaefb..e87b433 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 = False
>      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
> 
> --
> 2.7.4

Re: [master][PATCH] standard.py: Not filtering devtool workspace for devtool finish

[Alexander Kanavin]

[-- Attachment #1: Type: text/plain, Size: 2951 bytes --]

Unfortunately this broke 'devtool upgrade' functionality, where 'devtool
finish' erroneously rewrites SRC_URI to no longer include the path to the
remote tarball.

I will have to send a revert for this.

Alex

On Thu, 3 Oct 2019 at 01:10, Jaewon Lee <JAEWON@xilinx.com> wrote:

> ping
>
> > -----Original Message-----
> > From: Jaewon Lee <jaewon.lee@xilinx.com>
> > Sent: Thursday, September 19, 2019 5:13 PM
> > To: openembedded-core@lists.openembedded.org;
> > paul.eggleton@linux.intel.com; Manjukumar Harthikote Matha
> > <MANJUKUM@xilinx.com>; Alejandro Enedino Hernandez Samaniego
> > <alejandr@xilinx.com>
> > Cc: Jaewon Lee <JAEWON@xilinx.com>
> > Subject: [OE-core][master][PATCH] 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@xilinx.com>
> > ---
> >  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 9eeaefb..e87b433 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 = False
> >      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
> >
> > --
> > 2.7.4
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>

[-- Attachment #2: Type: text/html, Size: 4247 bytes --]