From 14abe7982c94ec44737866f89274d80b03ffb08c Mon Sep 17 00:00:00 2001 From: Ola x Nilsson Date: Tue, 25 Oct 2016 13:03:34 +0200 Subject: devtool: Load plugins in a well defined order To allow devtool plugins in one layer to shadow another in a well defined way, first search BBPATH/lib/devtool directories and then scripts/lib/devool and load only the first found. The previous search and load loop would load all found plugins with the ones found later replacing any found before. (From OE-Core rev: 1b2b8a0a80de17ea053002fdd124055d2798029a) Signed-off-by: Ola x Nilsson Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- scripts/devtool | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'scripts/devtool') diff --git a/scripts/devtool b/scripts/devtool index 0c32c502a3..219749365c 100755 --- a/scripts/devtool +++ b/scripts/devtool @@ -294,7 +294,8 @@ def main(): finally: tinfoil.shutdown() - for path in [scripts_path] + global_args.bbpath.split(':'): + # Search BBPATH first to allow layers to override plugins in scripts_path + for path in global_args.bbpath.split(':') + [scripts_path]: pluginpath = os.path.join(path, 'lib', 'devtool') scriptutils.load_plugins(logger, plugins, pluginpath) -- cgit v1.2.3-54-g00ecf