summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOla x Nilsson <ola.x.nilsson@axis.com>2016-10-25 13:03:35 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-12-13 22:55:20 +0000
commit8dfc417780c6b119620fc7aaff1f4d7e21c2c2c9 (patch)
tree9935b9ba7008386ad2c68f76cc4e6b4d707a72bb
parent14abe7982c94ec44737866f89274d80b03ffb08c (diff)
downloadpoky-8dfc417780c6b119620fc7aaff1f4d7e21c2c2c9.tar.gz
recipetool: Load plugins in a well defined order
To allow recipetool plugins in one layer to shadow another in a well defined way, first search BBPATH/lib/recipetool directories and then scripts/lib/recipetool 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: 7a8726a3662a3909dc6ef6e8d1029d0b1aa938c3) 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>
-rwxr-xr-xscripts/recipetool4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/recipetool b/scripts/recipetool
index 1052cd2b22..00c9007b1c 100755
--- a/scripts/recipetool
+++ b/scripts/recipetool
@@ -78,8 +78,8 @@ def main():
78 78
79 tinfoil = tinfoil_init(False) 79 tinfoil = tinfoil_init(False)
80 try: 80 try:
81 for path in ([scripts_path] + 81 for path in (tinfoil.config_data.getVar('BBPATH', True).split(':')
82 tinfoil.config_data.getVar('BBPATH', True).split(':')): 82 + [scripts_path]):
83 pluginpath = os.path.join(path, 'lib', 'recipetool') 83 pluginpath = os.path.join(path, 'lib', 'recipetool')
84 scriptutils.load_plugins(logger, plugins, pluginpath) 84 scriptutils.load_plugins(logger, plugins, pluginpath)
85 85