[gnome-continuous-yocto/gnomeostree-3.28-rocko: 2886/8267] devtool: modify command fails to ignore source files

[Emmanuele Bassi <ebassi src gnome org>]

commit 3c51b742c920d91f435f41aaf03efa73b8d17fe0
Author: Stephano Cetola <stephano cetola linux intel com>
Date:   Wed Oct 5 10:07:17 2016 -0700

    devtool: modify command fails to ignore source files
    
    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
    
    (From OE-Core rev: 31f1bbad248c36a8c86dde4ff57ce42efc664082)
    
    Signed-off-by: Stephano Cetola <stephano cetola linux intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/lib/devtool/standard.py |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index 4b9b173..4eff6f8 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -581,8 +581,14 @@ 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
+                       (srcabspath == workdir or not
+                       os.path.join(workdir, fname).startswith(srcabspath +
+                           os.sep))]
         if local_files:
             for fname in local_files:
                 _move_file(os.path.join(workdir, fname),