summaryrefslogtreecommitdiffstats
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
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>
-rw-r--r--meta/classes/image-wic.bbclass4
-rw-r--r--meta/lib/oeqa/selftest/wic.py2
-rw-r--r--scripts/lib/wic/plugins/source/isoimage-isohybrid.py2
3 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/image-wic.bbclass b/meta/classes/image-wic.bbclass
index 2acfd659f1..ab2e5412de 100644
--- a/meta/classes/image-wic.bbclass
+++ b/meta/classes/image-wic.bbclass
@@ -2,8 +2,8 @@
2# variables from this list is written to <image>.env file 2# variables from this list is written to <image>.env file
3WICVARS ?= "\ 3WICVARS ?= "\
4 BBLAYERS IMGDEPLOYDIR DEPLOY_DIR_IMAGE FAKEROOTCMD HDDDIR IMAGE_BASENAME IMAGE_BOOT_FILES \ 4 BBLAYERS IMGDEPLOYDIR DEPLOY_DIR_IMAGE FAKEROOTCMD HDDDIR IMAGE_BASENAME IMAGE_BOOT_FILES \
5 IMAGE_LINK_NAME IMAGE_ROOTFS INITRAMFS_FSTYPES INITRD ISODIR MACHINE_ARCH RECIPE_SYSROOT_NATIVE \ 5 IMAGE_LINK_NAME IMAGE_ROOTFS INITRAMFS_FSTYPES INITRD INITRD_LIVE ISODIR MACHINE_ARCH \
6 ROOTFS_SIZE STAGING_DATADIR STAGING_DIR STAGING_LIBDIR TARGET_SYS" 6 RECIPE_SYSROOT_NATIVE ROOTFS_SIZE STAGING_DATADIR STAGING_DIR STAGING_LIBDIR TARGET_SYS"
7 7
8WKS_FILE ??= "${IMAGE_BASENAME}.${MACHINE}.wks" 8WKS_FILE ??= "${IMAGE_BASENAME}.${MACHINE}.wks"
9WKS_FILES ?= "${WKS_FILE} ${IMAGE_BASENAME}.wks" 9WKS_FILES ?= "${WKS_FILE} ${IMAGE_BASENAME}.wks"
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
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: