summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorLee Chee Yang <chee.yang.lee@intel.com>2020-04-01 14:39:56 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-04-02 15:24:59 +0100
commitb5a3625e5934f3eabebbc2253765194e4ada2fa1 (patch)
treed8dc8ebbe864bf840767a4cccc39c6aadbde75a2 /scripts
parent93b4aeecbbf64e92a09159bc486e8bd0c0429703 (diff)
downloadpoky-b5a3625e5934f3eabebbc2253765194e4ada2fa1.tar.gz
wic: align layer plugin path
wic look for external layer source plugin under scripts/lib/ while other tools look for lib/. allow wic to check for source plugin at both scripts/lib/ and lib/ to align with other tools while avoid breaking any existing source plugin in external layer. [YOCTO #13056] (From OE-Core rev: 986baff26bd96a6265f5fe2d631818fff9f66374) Signed-off-by: Lee Chee Yang <chee.yang.lee@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/wic/help.py3
-rw-r--r--scripts/lib/wic/pluginbase.py11
2 files changed, 8 insertions, 6 deletions
diff --git a/scripts/lib/wic/help.py b/scripts/lib/wic/help.py
index 4d342fcf05..1e3d06a87b 100644
--- a/scripts/lib/wic/help.py
+++ b/scripts/lib/wic/help.py
@@ -536,7 +536,8 @@ DESCRIPTION
536 536
537 Source plugins can also be implemented and added by external 537 Source plugins can also be implemented and added by external
538 layers - any plugins found in a scripts/lib/wic/plugins/source/ 538 layers - any plugins found in a scripts/lib/wic/plugins/source/
539 directory in an external layer will also be made available. 539 or lib/wic/plugins/source/ directory in an external layer will
540 also be made available.
540 541
541 When the wic implementation needs to invoke a partition-specific 542 When the wic implementation needs to invoke a partition-specific
542 implementation, it looks for the plugin that has the same name as 543 implementation, it looks for the plugin that has the same name as
diff --git a/scripts/lib/wic/pluginbase.py b/scripts/lib/wic/pluginbase.py
index f74d6430fd..d9b4e57747 100644
--- a/scripts/lib/wic/pluginbase.py
+++ b/scripts/lib/wic/pluginbase.py
@@ -18,7 +18,7 @@ from wic.misc import get_bitbake_var
18 18
19PLUGIN_TYPES = ["imager", "source"] 19PLUGIN_TYPES = ["imager", "source"]
20 20
21SCRIPTS_PLUGIN_DIR = "scripts/lib/wic/plugins" 21SCRIPTS_PLUGIN_DIR = ["scripts/lib/wic/plugins", "lib/wic/plugins"]
22 22
23logger = logging.getLogger('wic') 23logger = logging.getLogger('wic')
24 24
@@ -38,10 +38,11 @@ class PluginMgr:
38 cls._plugin_dirs = [os.path.join(os.path.dirname(__file__), 'plugins')] 38 cls._plugin_dirs = [os.path.join(os.path.dirname(__file__), 'plugins')]
39 layers = get_bitbake_var("BBLAYERS") or '' 39 layers = get_bitbake_var("BBLAYERS") or ''
40 for layer_path in layers.split(): 40 for layer_path in layers.split():
41 path = os.path.join(layer_path, SCRIPTS_PLUGIN_DIR) 41 for script_plugin_dir in SCRIPTS_PLUGIN_DIR:
42 path = os.path.abspath(os.path.expanduser(path)) 42 path = os.path.join(layer_path, script_plugin_dir)
43 if path not in cls._plugin_dirs and os.path.isdir(path): 43 path = os.path.abspath(os.path.expanduser(path))
44 cls._plugin_dirs.insert(0, path) 44 if path not in cls._plugin_dirs and os.path.isdir(path):
45 cls._plugin_dirs.insert(0, path)
45 46
46 if ptype not in PLUGINS: 47 if ptype not in PLUGINS:
47 # load all ptype plugins 48 # load all ptype plugins