diff options
Diffstat (limited to 'meta')
-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): | |||
901 | with open(checkfile, "w") as f: | 901 | with open(checkfile, "w") as f: |
902 | f.write(tmpdir) | 902 | f.write(tmpdir) |
903 | 903 | ||
904 | # Check vmdk and live can't be built together. | ||
905 | if 'vmdk' in d.getVar('IMAGE_FSTYPES', True) and 'live' in d.getVar('IMAGE_FSTYPES', True): | ||
906 | status.addresult("Error, IMAGE_FSTYPES vmdk and live can't be built together\n") | ||
907 | |||
908 | # Check vdi and live can't be built together. | ||
909 | if 'vdi' in d.getVar('IMAGE_FSTYPES', True) and 'live' in d.getVar('IMAGE_FSTYPES', True): | ||
910 | status.addresult("Error, IMAGE_FSTYPES vdi and live can't be built together\n") | ||
911 | |||
912 | # Check qcow2 and live can't be built together. | ||
913 | if 'qcow2' in d.getVar('IMAGE_FSTYPES', True) and 'live' in d.getVar('IMAGE_FSTYPES', True): | ||
914 | status.addresult("Error, IMAGE_FSTYPES qcow2 and live can't be built together\n") | ||
915 | |||
916 | # Check /bin/sh links to dash or bash | 904 | # Check /bin/sh links to dash or bash |
917 | real_sh = os.path.realpath('/bin/sh') | 905 | real_sh = os.path.realpath('/bin/sh') |
918 | if not real_sh.endswith('/dash') and not real_sh.endswith('/bash'): | 906 | if not real_sh.endswith('/dash') and not real_sh.endswith('/bash'): |