summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorStephano Cetola <stephano.cetola@linux.intel.com>2016-10-05 10:07:17 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-10-06 07:51:01 +0100
commit3c51b742c920d91f435f41aaf03efa73b8d17fe0 (patch)
tree9ee0d3dd8f42197b1252fd16e626801628aac88d /scripts
parent79286b497a2733a5939bb0ab03144cbeab35904e (diff)
downloadpoky-3c51b742c920d91f435f41aaf03efa73b8d17fe0.tar.gz
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>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/devtool/standard.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index 4b9b173156..4eff6f878b 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):
581 recipe_patches = [os.path.basename(patch) for patch in 581 recipe_patches = [os.path.basename(patch) for patch in
582 oe.recipeutils.get_recipe_patches(crd)] 582 oe.recipeutils.get_recipe_patches(crd)]
583 local_files = oe.recipeutils.get_recipe_local_files(crd) 583 local_files = oe.recipeutils.get_recipe_local_files(crd)
584
585 # Ignore local files with subdir={BP}
586 srcabspath = os.path.abspath(srcsubdir)
584 local_files = [fname for fname in local_files if 587 local_files = [fname for fname in local_files if
585 os.path.exists(os.path.join(workdir, fname))] 588 os.path.exists(os.path.join(workdir, fname)) and
589 (srcabspath == workdir or not
590 os.path.join(workdir, fname).startswith(srcabspath +
591 os.sep))]
586 if local_files: 592 if local_files:
587 for fname in local_files: 593 for fname in local_files:
588 _move_file(os.path.join(workdir, fname), 594 _move_file(os.path.join(workdir, fname),