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-05 23:22:33 +0100
commit31f1bbad248c36a8c86dde4ff57ce42efc664082 (patch)
tree8d52643af5029627586eae76c48a26de8ee12ee4 /scripts
parent06c732bb8e2896d789716e7f0635aac9ff3a2d42 (diff)
downloadopenembedded-core-contrib-31f1bbad248c36a8c86dde4ff57ce42efc664082.tar.gz
openembedded-core-contrib-31f1bbad248c36a8c86dde4ff57ce42efc664082.tar.bz2
openembedded-core-contrib-31f1bbad248c36a8c86dde4ff57ce42efc664082.zip
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 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):
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),