[oe-commits] [openembedded-core] 05/25: wic: look for wks files in <layer>/wic

[git at git.openembedded.org]

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit 803b5fa798cf7580c7c10401eb04a1cccf51b8ab
Author: Ed Bartosh <ed.bartosh at linux.intel.com>
AuthorDate: Mon Dec 19 14:41:02 2016 +0200

    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.
    
    Signed-off-by: Ed Bartosh <ed.bartosh at linux.intel.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 scripts/lib/wic/engine.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py
index 5b10463..2adef2f 100644
--- a/scripts/lib/wic/engine.py
+++ b/scripts/lib/wic/engine.py
@@ -52,6 +52,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"
 
 def build_canned_image_list(path):
     layers_path = misc.get_bitbake_var("BBLAYERS")
@@ -59,8 +60,10 @@ def build_canned_image_list(path):
 
     if layers_path is not None:
         for layer_path in layers_path.split():
-            cpath = os.path.join(layer_path, SCRIPTS_CANNED_IMAGE_DIR)
-            canned_wks_layer_dirs.append(cpath)
+            for wks_path in (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)
 
     cpath = os.path.join(path, CANNED_IMAGE_DIR)
     canned_wks_layer_dirs.append(cpath)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.