@@ -46,6 +46,7 @@ def verify_build_env():
CANNED_IMAGE_DIR = "lib/wic/canned-wks" # relative to scripts
SCRIPTS_CANNED_IMAGE_DIR = "scripts/" + CANNED_IMAGE_DIR
WIC_DIR = "wic"
+WIC_FILES_DIR = "files/wic"
def build_canned_image_list(path):
layers_path = get_bitbake_var("BBLAYERS")
@@ -53,7 +54,7 @@ def build_canned_image_list(path):
if layers_path is not None:
for layer_path in layers_path.split():
- for wks_path in (WIC_DIR, SCRIPTS_CANNED_IMAGE_DIR):
+ for wks_path in (WIC_FILES_DIR, WIC_DIR, SCRIPTS_CANNED_IMAGE_DIR):
cpath = os.path.join(layer_path, wks_path)
if os.path.isdir(cpath):
canned_wks_layer_dirs.append(cpath)
Going forward, "files/wic" is the logical place for layers to place wic files to fit in with usual layer file layouts. Add this to the search path. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> --- src/wic/engine.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)