summaryrefslogtreecommitdiffstats
path: root/scripts/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 /scripts/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 'scripts/lib')
-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):
144 Create path for initramfs image 144 Create path for initramfs image
145 """ 145 """
146 146
147 initrd = get_bitbake_var("INITRD") 147 initrd = get_bitbake_var("INITRD_LIVE") or get_bitbake_var("INITRD")
148 if not initrd: 148 if not initrd:
149 initrd_dir = get_bitbake_var("DEPLOY_DIR_IMAGE") 149 initrd_dir = get_bitbake_var("DEPLOY_DIR_IMAGE")
150 if not initrd_dir: 150 if not initrd_dir: