diff options
author | Ola x Nilsson <ola.x.nilsson@axis.com> | 2016-10-25 13:03:34 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-12-13 22:55:20 +0000 |
commit | 14abe7982c94ec44737866f89274d80b03ffb08c (patch) | |
tree | 0b974d51f917b6c7403c5cb02b03fa8f7556e57c /scripts/devtool | |
parent | 276523149914a75a939278b2e577383a2fdf3813 (diff) | |
download | poky-14abe7982c94ec44737866f89274d80b03ffb08c.tar.gz |
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 <ola.x.nilsson@axis.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/devtool')
-rwxr-xr-x | scripts/devtool | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/devtool b/scripts/devtool index 0c32c502a3..219749365c 100755 --- a/scripts/devtool +++ b/scripts/devtool | |||
@@ -294,7 +294,8 @@ def main(): | |||
294 | finally: | 294 | finally: |
295 | tinfoil.shutdown() | 295 | tinfoil.shutdown() |
296 | 296 | ||
297 | for path in [scripts_path] + global_args.bbpath.split(':'): | 297 | # Search BBPATH first to allow layers to override plugins in scripts_path |
298 | for path in global_args.bbpath.split(':') + [scripts_path]: | ||
298 | pluginpath = os.path.join(path, 'lib', 'devtool') | 299 | pluginpath = os.path.join(path, 'lib', 'devtool') |
299 | scriptutils.load_plugins(logger, plugins, pluginpath) | 300 | scriptutils.load_plugins(logger, plugins, pluginpath) |
300 | 301 | ||