mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-01 00:59:48 +00:00
Code Issues Projects Releases Wiki Activity

sanity.bbclass: remove conflict checking for image vm and live

Browse Source 
[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>
This commit is contained in:
Robert Yang
2016-02-24 01:23:59 -08:00
committed by Richard Purdie
parent bb1c719250
commit 86759deb5c
1 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/sanity.bbclass
-12
View File
@@ -901,18 +901,6 @@ def check_sanity_everybuild(status, d):
with open(checkfile, "w") as f: with open(checkfile, "w") as f:
f.write(tmpdir) 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 # Check /bin/sh links to dash or bash
real_sh = os.path.realpath('/bin/sh') real_sh = os.path.realpath('/bin/sh')
if not real_sh.endswith('/dash') and not real_sh.endswith('/bash'): if not real_sh.endswith('/dash') and not real_sh.endswith('/bash'):