diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2015-08-16 11:08:36 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-08-19 18:05:38 +0100 |
commit | 5e880674a319fe43d2cc7cc867df894483c858d5 (patch) | |
tree | 58712354e0e540e7a16b242ca2fbaf3ecc91ca0d /scripts/lib | |
parent | 1019d8c802d426e0692f3b5939fa34fb46ff002d (diff) | |
download | poky-5e880674a319fe43d2cc7cc867df894483c858d5.tar.gz |
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).
(From OE-Core rev: 5be16d639d1b78d114755bfd552ac901d0fdf4a9)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib')
-rw-r--r-- | scripts/lib/devtool/standard.py | 2 |
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): | |||
294 | 294 | ||
295 | task_executor = BbTaskExecutor(crd) | 295 | task_executor = BbTaskExecutor(crd) |
296 | 296 | ||
297 | crd.setVar('EXTERNALSRC_forcevariable', '') | ||
298 | |||
297 | logger.info('Fetching %s...' % pn) | 299 | logger.info('Fetching %s...' % pn) |
298 | task_executor.exec_func('do_fetch', False) | 300 | task_executor.exec_func('do_fetch', False) |
299 | logger.info('Unpacking...') | 301 | logger.info('Unpacking...') |