summaryrefslogtreecommitdiffstats
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:59:13 +0100
commitfe0f6434969aa4868467e7882c372f5eb7a834f1 (patch)
treef4ce2ab6706ff62a8cea7c7d23e69aef2a922c24
parent11774198ef6ebb7df1b695be5fd1261d7102b343 (diff)
downloadpoky-fe0f6434969aa4868467e7882c372f5eb7a834f1.tar.gz
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>
-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):
831 if 'vmdk' in d.getVar('IMAGE_FSTYPES', True) and 'live' in d.getVar('IMAGE_FSTYPES', True): 831 if 'vmdk' in d.getVar('IMAGE_FSTYPES', True) and 'live' in d.getVar('IMAGE_FSTYPES', True):
832 status.addresult("Error, IMAGE_FSTYPES vmdk and live can't be built together\n") 832 status.addresult("Error, IMAGE_FSTYPES vmdk and live can't be built together\n")
833 833
834 # Check vdi and live can't be built together.
835 if 'vdi' in d.getVar('IMAGE_FSTYPES', True) and 'live' in d.getVar('IMAGE_FSTYPES', True):
836 status.addresult("Error, IMAGE_FSTYPES vdi and live can't be built together\n")
837
838
834def check_sanity(sanity_data): 839def check_sanity(sanity_data):
835 class SanityStatus(object): 840 class SanityStatus(object):
836 def __init__(self): 841 def __init__(self):