[oe-commits] [openembedded-core] 16/20: sanity.bbclass: remove conflict checking for image vm and live
git at git.openembedded.org
git at git.openembedded.org
Mon Feb 29 17:39:42 UTC 2016
rpurdie pushed a commit to branch master-next
in repository openembedded-core.
commit 0221ee7ef55ff99c81b9c238028337c7944f750a
Author: Robert Yang <liezhi.yang at windriver.com>
AuthorDate: Wed Feb 24 01:23:59 2016 -0800
sanity.bbclass: remove conflict checking for image vm and live
[YOCTO #9161]
Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>
---
meta/classes/sanity.bbclass | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 52581f6..cdb2899 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -901,18 +901,6 @@ def check_sanity_everybuild(status, d):
with open(checkfile, "w") as f:
f.write(tmpdir)
- # Check vmdk and live can't be built together.
- 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")
-
- # Check qcow2 and live can't be built together.
- if 'qcow2' in d.getVar('IMAGE_FSTYPES', True) and 'live' in d.getVar('IMAGE_FSTYPES', True):
- status.addresult("Error, IMAGE_FSTYPES qcow2 and live can't be built together\n")
-
# Check /bin/sh links to dash or bash
real_sh = os.path.realpath('/bin/sh')
if not real_sh.endswith('/dash') and not real_sh.endswith('/bash'):
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list