[oe-commits] Paul Eggleton : devtool: extract: prevent externalsrc from interfering with extraction

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 5be16d639d1b78d114755bfd552ac901d0fdf4a9
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=5be16d639d1b78d114755bfd552ac901d0fdf4a9

Author: Paul Eggleton <paul.eggleton at linux.intel.com>
Date:   Sun Aug 16 11:08:36 2015 +0100

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 at linux.intel.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>

---

 scripts/lib/devtool/standard.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index ea21877..e4ee7f7 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...')