summaryrefslogtreecommitdiff
path: root/scripts
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:13:28 +0000
commitc672753be60550b15d5d593c251b61776d5b104d (patch)
tree770b01f927246dc6c6c79dab8ef39a37e96cb3a8 /scripts
parent786368568a9525212e69f5cbf6da236f0a6be013 (diff)
downloadopenembedded-core-c672753be60550b15d5d593c251b61776d5b104d.tar.gz
openembedded-core-c672753be60550b15d5d593c251b61776d5b104d.tar.bz2
openembedded-core-c672753be60550b15d5d593c251b61776d5b104d.zip
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. Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/wic/plugins/source/isoimage-isohybrid.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
index a8a5dc0a59..fd251908d2 100644
--- a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
+++ b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
@@ -144,7 +144,7 @@ class IsoImagePlugin(SourcePlugin):
Create path for initramfs image
"""
- initrd = get_bitbake_var("INITRD")
+ initrd = get_bitbake_var("INITRD_LIVE") or get_bitbake_var("INITRD")
if not initrd:
initrd_dir = get_bitbake_var("DEPLOY_DIR_IMAGE")
if not initrd_dir: