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:07 +0000 |
| commit | f350bedf745b356a74e3a15d82055472796580fe (patch) | |
| tree | 82e19784ef578bae5ccc032a56659b19dc744ec9 /meta/classes/sanity.bbclass | |
| parent | e38c94d6bf83ed3ca7f046d9503e81b927487bf2 (diff) | |
| download | openembedded-core-f350bedf745b356a74e3a15d82055472796580fe.tar.gz | |
sanity.bbclass: remove conflict checking for image vm and live
[YOCTO #9161]
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/classes/sanity.bbclass')
| -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'): |