From: Paul Eggleton Date: Sun, 16 Aug 2015 10:08:36 +0000 (+0100) Subject: devtool: extract: prevent externalsrc from interfering with extraction X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~29335 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5be16d639d1b78d114755bfd552ac901d0fdf4a9;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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 Signed-off-by: Ross Burton --- diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index ea21877b18a..e4ee7f7491f 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...')