diff options
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/lib/wic/engine.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py index 5b104631ca..2adef2f99f 100644 --- a/scripts/lib/wic/engine.py +++ b/scripts/lib/wic/engine.py | |||
@@ -52,6 +52,7 @@ def verify_build_env(): | |||
52 | 52 | ||
53 | CANNED_IMAGE_DIR = "lib/wic/canned-wks" # relative to scripts | 53 | CANNED_IMAGE_DIR = "lib/wic/canned-wks" # relative to scripts |
54 | SCRIPTS_CANNED_IMAGE_DIR = "scripts/" + CANNED_IMAGE_DIR | 54 | SCRIPTS_CANNED_IMAGE_DIR = "scripts/" + CANNED_IMAGE_DIR |
55 | WIC_DIR = "wic" | ||
55 | 56 | ||
56 | def build_canned_image_list(path): | 57 | def build_canned_image_list(path): |
57 | layers_path = misc.get_bitbake_var("BBLAYERS") | 58 | layers_path = misc.get_bitbake_var("BBLAYERS") |
@@ -59,8 +60,10 @@ def build_canned_image_list(path): | |||
59 | 60 | ||
60 | if layers_path is not None: | 61 | if layers_path is not None: |
61 | for layer_path in layers_path.split(): | 62 | for layer_path in layers_path.split(): |
62 | cpath = os.path.join(layer_path, SCRIPTS_CANNED_IMAGE_DIR) | 63 | for wks_path in (WIC_DIR, SCRIPTS_CANNED_IMAGE_DIR): |
63 | canned_wks_layer_dirs.append(cpath) | 64 | cpath = os.path.join(layer_path, wks_path) |
65 | if os.path.isdir(cpath): | ||
66 | canned_wks_layer_dirs.append(cpath) | ||
64 | 67 | ||
65 | cpath = os.path.join(path, CANNED_IMAGE_DIR) | 68 | cpath = os.path.join(path, CANNED_IMAGE_DIR) |
66 | canned_wks_layer_dirs.append(cpath) | 69 | canned_wks_layer_dirs.append(cpath) |