diff options
| author |   Robert Yang <liezhi.yang@windriver.com> | 2016-02-24 01:23:59 -0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-02 23:08:51 +0000 |
| commit | 86759deb5cd6e6bf574f3ba9846c86c4440b0dfb (patch) | |
| tree | 27e96e8bf4583b26ce34e6c6032cb2b97e847293 /meta/classes | |
| parent | bb1c719250cecc8725147cbdd999a9a44a11b549 (diff) | |
| download | openembedded-core-contrib-86759deb5cd6e6bf574f3ba9846c86c4440b0dfb.tar.gz | |
sanity.bbclass: remove conflict checking for image vm and live
[YOCTO #9161]
(From OE-Core rev: f350bedf745b356a74e3a15d82055472796580fe)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/sanity.bbclass | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index 52581f6ba7..cdb28995c6 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'): |