From 5be16d639d1b78d114755bfd552ac901d0fdf4a9 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Sun, 16 Aug 2015 11:08:36 +0100 Subject: 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 --- scripts/lib/devtool/standard.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'scripts/lib/devtool') 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...') -- cgit 1.2.3-korg