summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2017-01-12 19:06:02 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-31 14:38:32 +0000
commit62310b3726cbbbd34da74f90e7de92ad831aa297 (patch)
treeb31b50aa98bac3a2160a62f8876e0fa3ea327099
parent8a04795db6ac2f5bd9d64f2dd878a9da209f508a (diff)
downloadpoky-62310b3726cbbbd34da74f90e7de92ad831aa297.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. (From OE-Core rev: b3ed3a79852f85651c8fa192a8118f9904e88ef8) 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.bbclass2
-rw-r--r--meta/lib/oeqa/selftest/wic.py4
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
3WICVARS ?= "\ 3WICVARS ?= "\
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