diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/image-wic.bbclass | 2 | ||||
-rw-r--r-- | meta/lib/oeqa/selftest/wic.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/image-wic.bbclass b/meta/classes/image-wic.bbclass index ab2e5412de..bd79073b76 100644 --- a/meta/classes/image-wic.bbclass +++ b/meta/classes/image-wic.bbclass | |||
@@ -1,7 +1,7 @@ | |||
1 | # The WICVARS variable is used to define list of bitbake variables used in wic code | 1 | # The WICVARS variable is used to define list of bitbake variables used in wic code |
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 IMAGE_BASENAME IMAGE_BOOT_FILES \ |
5 | IMAGE_LINK_NAME IMAGE_ROOTFS INITRAMFS_FSTYPES INITRD INITRD_LIVE ISODIR MACHINE_ARCH \ | 5 | IMAGE_LINK_NAME IMAGE_ROOTFS INITRAMFS_FSTYPES INITRD INITRD_LIVE ISODIR MACHINE_ARCH \ |
6 | RECIPE_SYSROOT_NATIVE 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 | ||
diff --git a/meta/lib/oeqa/selftest/wic.py b/meta/lib/oeqa/selftest/wic.py index 8eb77aee2a..ebbb280163 100644 --- a/meta/lib/oeqa/selftest/wic.py +++ b/meta/lib/oeqa/selftest/wic.py | |||
@@ -372,8 +372,8 @@ class Wic(oeSelfTest): | |||
372 | 372 | ||
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(('IMAGE_BOOT_FILES', 'INITRD', |
376 | 'INITRD', 'INITRD_LIVE', 'ISODIR')) | 376 | '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 |