From 1c8acea91e775b1b6f8b25e774aaba3e790fc59b Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Tue, 12 Jul 2016 16:50:03 -0500 Subject: wic: Look for image artifacts in a common location Rather than have each image type look for artifacts in image-specific locations, move towards having them look for artifacts in a common location, in this case DEPLOY_DIR_IMAGE Use the existing deploy.bbclass to have the bootloaders put their binaries in DEPLOY_DIR_IMAGE and then wic will find them and place them in the image Signed-off-by: Alejandro Hernandez Signed-off-by: Tom Zanussi Signed-off-by: Saul Wold --- meta/lib/oeqa/selftest/wic.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta/lib') diff --git a/meta/lib/oeqa/selftest/wic.py b/meta/lib/oeqa/selftest/wic.py index ebbb280163..da68e25213 100644 --- a/meta/lib/oeqa/selftest/wic.py +++ b/meta/lib/oeqa/selftest/wic.py @@ -372,8 +372,8 @@ class Wic(oeSelfTest): wicvars = set(get_bb_var('WICVARS', image).split()) # filter out optional variables - wicvars = wicvars.difference(('IMAGE_BOOT_FILES', 'INITRD', - 'INITRD_LIVE', 'ISODIR')) + wicvars = wicvars.difference(('DEPLOY_DIR_IMAGE', 'IMAGE_BOOT_FILES', + 'INITRD', 'INITRD_LIVE', 'ISODIR')) with open(path) as envfile: content = dict(line.split("=", 1) for line in envfile) # test if variables used by wic present in the .env file -- cgit v1.2.3