[oe-commits] Juro Bystricky : sanity.bbclass: Prevent 'vdi' and 'live' to be built together

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: deb7ee16cd04b03417a68d32d14b5b0ad3c59eca
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=deb7ee16cd04b03417a68d32d14b5b0ad3c59eca

Author: Juro Bystricky <juro.bystricky at intel.com>
Date:   Wed Jun  3 11:07:26 2015 -0700

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

Same reason and check as for vmdk.

Signed-off-by: Juro Bystricky <juro.bystricky at intel.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>

---

 meta/classes/sanity.bbclass | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 6983037..c66fd4a 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):