summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2017-01-12 18:32:41 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-31 14:38:32 +0000
commita508cb384c00d7ce5770f16c2523a3f05eb799a4 (patch)
tree578f5ae42b5c0af87ddb742bbd494ace5d15c78f /meta/lib
parent02dafba6ed8ebc718a4f513455fc034444543301 (diff)
downloadpoky-a508cb384c00d7ce5770f16c2523a3f05eb799a4.tar.gz
wic: use INITRD_LIVE in isoimage-isohybrid
INITRD variable is not set if hddimg is disabled. isoimage-isohybrid can't get correct name for initrd if INITRD variable is not set. Added INITRD_LIVE to WICVARS and used it in isoimage-isohybrid code to get initrd artifact name. Used INITRD if INITRD_LIVE is not set. (From OE-Core rev: c672753be60550b15d5d593c251b61776d5b104d) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oeqa/selftest/wic.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oeqa/selftest/wic.py b/meta/lib/oeqa/selftest/wic.py
index 53631fa595..8eb77aee2a 100644
--- a/meta/lib/oeqa/selftest/wic.py
+++ b/meta/lib/oeqa/selftest/wic.py
@@ -373,7 +373,7 @@ class Wic(oeSelfTest):
373 wicvars = set(get_bb_var('WICVARS', image).split()) 373 wicvars = set(get_bb_var('WICVARS', image).split())
374 # filter out optional variables 374 # filter out optional variables
375 wicvars = wicvars.difference(('HDDDIR', 'IMAGE_BOOT_FILES', 375 wicvars = wicvars.difference(('HDDDIR', 'IMAGE_BOOT_FILES',
376 'INITRD', 'ISODIR')) 376 'INITRD', 'INITRD_LIVE', 'ISODIR'))
377 with open(path) as envfile: 377 with open(path) as envfile:
378 content = dict(line.split("=", 1) for line in envfile) 378 content = dict(line.split("=", 1) for line in envfile)
379 # test if variables used by wic present in the .env file 379 # test if variables used by wic present in the .env file