diff options
| author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2017-01-12 18:32:41 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-01-31 14:38:32 +0000 |
| commit | a508cb384c00d7ce5770f16c2523a3f05eb799a4 (patch) | |
| tree | 578f5ae42b5c0af87ddb742bbd494ace5d15c78f /meta | |
| parent | 02dafba6ed8ebc718a4f513455fc034444543301 (diff) | |
| download | poky-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')
| -rw-r--r-- | meta/classes/image-wic.bbclass | 4 | ||||
| -rw-r--r-- | meta/lib/oeqa/selftest/wic.py | 2 |
2 files changed, 3 insertions, 3 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 |
| 3 | WICVARS ?= "\ | 3 | WICVARS ?= "\ |
| 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 | ||
| 8 | WKS_FILE ??= "${IMAGE_BASENAME}.${MACHINE}.wks" | 8 | WKS_FILE ??= "${IMAGE_BASENAME}.${MACHINE}.wks" |
| 9 | WKS_FILES ?= "${WKS_FILE} ${IMAGE_BASENAME}.wks" | 9 | WKS_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 |