summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2015-08-16 11:08:36 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-19 17:57:53 +0100
commit5be16d639d1b78d114755bfd552ac901d0fdf4a9 (patch)
tree3322ef472f743b0498e8817a6c75dfdf21d5f690 /scripts
parent4096f3c5d309161999adc996fdfa7526e5504366 (diff)
downloadopenembedded-core-5be16d639d1b78d114755bfd552ac901d0fdf4a9.tar.gz
openembedded-core-5be16d639d1b78d114755bfd552ac901d0fdf4a9.tar.bz2
openembedded-core-5be16d639d1b78d114755bfd552ac901d0fdf4a9.zip
devtool: extract: prevent externalsrc from interfering with extraction
In case the user has set up externalsrc outside of devtool, force EXTERNALSRC to blank for the recipe when extracting so that the original source URI is still in SRC_URI and we're still able to extract it. (This isn't a problem with devtool itself because the bbappends within the workspace layer that apply externalsrc are explicitly filtered out when devtool parses a recipe). Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/devtool/standard.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index ea21877b18..e4ee7f7491 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -294,6 +294,8 @@ def _extract_source(srctree, keep_temp, devbranch, d):
task_executor = BbTaskExecutor(crd)
+ crd.setVar('EXTERNALSRC_forcevariable', '')
+
logger.info('Fetching %s...' % pn)
task_executor.exec_func('do_fetch', False)
logger.info('Unpacking...')