sanity.bbclass: Prevent 'vdi' and 'live' to be built together

Same reason and check as for vmdk.

(From OE-Core rev: deb7ee16cd04b03417a68d32d14b5b0ad3c59eca)

Signed-off-by: Juro Bystricky <juro.bystricky@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 698303743c4cd7eba2544f8ab90277335c71c21c..c66fd4a1cfa9d3626ab82421db8a26dfbc8a65c1 100644 (file)
--- 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):