diff options
| author | Ed Tanous <ed.tanous@intel.com> | 2019-07-31 20:59:18 +0300 |
|---|---|---|
| committer | Ed Tanous <ed.tanous@intel.com> | 2019-07-31 20:59:18 +0300 |
| commit | b4f66bacb1b8e661d794fa7a189e2f66f5092e2e (patch) | |
| tree | 5a8302cd349fdb68dadca003483c61917d4a6add /poky/scripts/lib/wic/engine.py | |
| parent | 43a183cc0926da36e3a218efa02ab4838ace316f (diff) | |
| parent | dd755025e33af27b059ea7ef3afbe850e4880b08 (diff) | |
| download | openbmc-b4f66bacb1b8e661d794fa7a189e2f66f5092e2e.tar.xz | |
Merge branch 'master' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into intel
Diffstat (limited to 'poky/scripts/lib/wic/engine.py')
| -rw-r--r-- | poky/scripts/lib/wic/engine.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/poky/scripts/lib/wic/engine.py b/poky/scripts/lib/wic/engine.py index 42e93c3eb..61939ad19 100644 --- a/poky/scripts/lib/wic/engine.py +++ b/poky/scripts/lib/wic/engine.py @@ -75,7 +75,8 @@ def find_canned_image(scripts_path, wks_file): for fname in files: if fname.endswith("~") or fname.endswith("#"): continue - if fname.endswith(".wks") and wks_file + ".wks" == fname: + if ((fname.endswith(".wks") and wks_file + ".wks" == fname) or \ + (fname.endswith(".wks.in") and wks_file + ".wks.in" == fname)): fullpath = os.path.join(canned_wks_dir, fname) return fullpath return None @@ -92,7 +93,7 @@ def list_canned_images(scripts_path): for fname in files: if fname.endswith("~") or fname.endswith("#"): continue - if fname.endswith(".wks"): + if fname.endswith(".wks") or fname.endswith(".wks.in"): fullpath = os.path.join(canned_wks_dir, fname) with open(fullpath) as wks: for line in wks: @@ -101,7 +102,7 @@ def list_canned_images(scripts_path): if idx != -1: desc = line[idx + len("short-description:"):].strip() break - basename = os.path.splitext(fname)[0] + basename = fname.split('.')[0] print(" %s\t\t%s" % (basename.ljust(30), desc)) |