summaryrefslogtreecommitdiffstats
path: root/scripts/lib
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2016-12-19 14:41:02 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-12-22 08:50:16 +0000
commit28c79d8aebb7f5ec054ba6996bbd0c5691120f33 (patch)
tree70df6d6eae78e76bf2bc2380076325c23daab08e /scripts/lib
parent45be34c8e00fb29649887fee34779334038226fc (diff)
downloadpoky-28c79d8aebb7f5ec054ba6996bbd0c5691120f33.tar.gz
wic: look for wks files in <layer>/wic
Currently wic looks for wks files in <layer dir>/scripts/lib/wic/canned-wks/ directories. This path is too nested and doesn't look consistent with the naming scheme of layer directories. Added <layer>/wic directory to the list of paths to look for wks files. (From OE-Core rev: 803b5fa798cf7580c7c10401eb04a1cccf51b8ab) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib')
-rw-r--r--scripts/lib/wic/engine.py7
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
53CANNED_IMAGE_DIR = "lib/wic/canned-wks" # relative to scripts 53CANNED_IMAGE_DIR = "lib/wic/canned-wks" # relative to scripts
54SCRIPTS_CANNED_IMAGE_DIR = "scripts/" + CANNED_IMAGE_DIR 54SCRIPTS_CANNED_IMAGE_DIR = "scripts/" + CANNED_IMAGE_DIR
55WIC_DIR = "wic"
55 56
56def build_canned_image_list(path): 57def 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)