summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2016-02-24 00:40:22 -0800
committerRobert Yang <liezhi.yang@windriver.com>2016-02-24 01:04:19 -0800
commitab4466085aaa486a832e18626be7fda1939e949e (patch)
tree624b64ac692f4dbd30d151d975e1e87ac1b59f8c
parentf70aac246a19614f16124a0293578ee46919399b (diff)
downloadopenembedded-core-contrib-rbt/syslinux.tar.gz
openembedded-core-contrib-rbt/syslinux.tar.bz2
openembedded-core-contrib-rbt/syslinux.zip
sanity.bbclass: remove conflict checking for image vm and liverbt/syslinux
[YOCTO #9161] Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
-rw-r--r--meta/classes/sanity.bbclass12
1 files changed, 0 insertions, 12 deletions
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 466eb49121..edf49da7de 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -843,18 +843,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'):