aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuro Bystricky <juro.bystricky@intel.com>2015-06-03 11:07:26 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-11 23:55:41 +0100
commitdeb7ee16cd04b03417a68d32d14b5b0ad3c59eca (patch)
tree59c30ddb9cc7b05fe67f76b7012b9f38e02a1735
parente4244af33888ef3c39e31ed89c5184f6a4c5e80c (diff)
downloadopenembedded-core-contrib-deb7ee16cd04b03417a68d32d14b5b0ad3c59eca.tar.gz
sanity.bbclass: Prevent 'vdi' and 'live' to be built together
Same reason and check as for vmdk. Signed-off-by: Juro Bystricky <juro.bystricky@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/classes/sanity.bbclass5
1 files changed, 5 insertions, 0 deletions
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 698303743c..c66fd4a1cf 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -831,6 +831,11 @@ def check_sanity_everybuild(status, d):
if 'vmdk' in d.getVar('IMAGE_FSTYPES', True) and 'live' in d.getVar('IMAGE_FSTYPES', True):
status.addresult("Error, IMAGE_FSTYPES vmdk and live can't be built together\n")
+ # Check vdi and live can't be built together.
+ if 'vdi' in d.getVar('IMAGE_FSTYPES', True) and 'live' in d.getVar('IMAGE_FSTYPES', True):
+ status.addresult("Error, IMAGE_FSTYPES vdi and live can't be built together\n")
+
+
def check_sanity(sanity_data):
class SanityStatus(object):
def __init__(self):