[OE-core] [PATCH V2] devtool: modify command fails to ignore source files

[Paul Eggleton]

On Sun, 02 Oct 2016 16:58:24 Stephano Cetola wrote:
> With recent changes to recipeutils, the list of local files returned
> by get_recipe_local_files could possibly include source files. This
> only happens when the recipe contains a SRC_URI using subdir= to put
> files in the source tree. These files should be ignored when
> populating the list of local files for oe-local-files directory.
> 
> [YOCTO #10326]
> 
> introduced in
> OE-Core revision 9069fef5dad5a873c8a8f720f7bcbc7625556309
> 
> Signed-off-by: Stephano Cetola <stephano.cetola at linux.intel.com>
> ---
>  scripts/lib/devtool/standard.py | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/scripts/lib/devtool/standard.py
> b/scripts/lib/devtool/standard.py index 8319145..b6f9e12 100644
> --- a/scripts/lib/devtool/standard.py
> +++ b/scripts/lib/devtool/standard.py
> @@ -568,8 +568,12 @@ def _extract_source(srctree, keep_temp, devbranch,
> sync, d): recipe_patches = [os.path.basename(patch) for patch in
>                            oe.recipeutils.get_recipe_patches(crd)]
>          local_files = oe.recipeutils.get_recipe_local_files(crd)
> +
> +        # Ignore local files with subdir={BP}
> +        srcabspath = os.path.abspath(srcsubdir)
>          local_files = [fname for fname in local_files if
> -                       os.path.exists(os.path.join(workdir, fname))]
> +                       os.path.exists(os.path.join(workdir, fname)) and
> +                       not os.path.join(workdir,
> fname).startswith(srcabspath)] if local_files:
>              for fname in local_files:
>                  _move_file(os.path.join(workdir, fname),

OK - this looks better. One minor tweak I'd suggest though is to add os.sep on 
the end of srcabspath so we can be sure we're matching that directory and not 
one whose name starts with the same string.

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre