diff options
| author |   Ed Bartosh <ed.bartosh@linux.intel.com> | 2017-01-12 19:06:02 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-01-31 14:13:28 +0000 |
| commit | b3ed3a79852f85651c8fa192a8118f9904e88ef8 (patch) | |
| tree | ed90637491ca35921fadc202602a8044684611ca /meta | |
| parent | 4ceb0df10db7254b290784cabc5279ffa2b946a4 (diff) | |
| download | openembedded-core-contrib-b3ed3a79852f85651c8fa192a8118f9904e88ef8.tar.gz | |
image-wic: remove HDDDIR from WICVARS
Removed HDDDIR as it's not used by wic anymore.
Stopped usage of HDDDIR in wic test suite.
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
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 @@ # The WICVARS variable is used to define list of bitbake variables used in wic code # variables from this list is written to <image>.env file WICVARS ?= "\ - BBLAYERS IMGDEPLOYDIR DEPLOY_DIR_IMAGE FAKEROOTCMD HDDDIR IMAGE_BASENAME IMAGE_BOOT_FILES \ + BBLAYERS IMGDEPLOYDIR DEPLOY_DIR_IMAGE FAKEROOTCMD IMAGE_BASENAME IMAGE_BOOT_FILES \ IMAGE_LINK_NAME IMAGE_ROOTFS INITRAMFS_FSTYPES INITRD INITRD_LIVE ISODIR MACHINE_ARCH \ RECIPE_SYSROOT_NATIVE ROOTFS_SIZE STAGING_DATADIR STAGING_DIR STAGING_LIBDIR TARGET_SYS" 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): wicvars = set(get_bb_var('WICVARS', image).split()) # filter out optional variables - wicvars = wicvars.difference(('HDDDIR', 'IMAGE_BOOT_FILES', - 'INITRD', 'INITRD_LIVE', 'ISODIR')) + wicvars = wicvars.difference(('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 |