From fe0f6434969aa4868467e7882c372f5eb7a834f1 Mon Sep 17 00:00:00 2001 From: Juro Bystricky Date: Wed, 3 Jun 2015 11:07:26 -0700 Subject: 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 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/classes/sanity.bbclass | 5 +++++ 1 file changed, 5 insertions(+) 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): -- cgit v1.2.3-54-g00ecf