From 521737f456b6ea7f7f153132c77cb74c08f088dc Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Wed, 18 Mar 2015 19:14:49 -0700 Subject: sanity.bbclass: vmdk and live can't be built together Both vmdk and live use syslinux, but they have different/conflicted configurations, the main conflictions are: vmdk live SYSLINUX_ROOT root=/dev/sda2 root=/dev/ram0 SYSLINUX_LABELS boot boot install INITRD No yes So it would make the boot menu strange and vmdk can't be boot, we need add a few extra vars to fix the problem such as SYSLINUX_ROOT_VMDK SYSLINUX_ROOT_LIVE, but that needs a lot of changes in the code, so just add a sanity checking for it. [YOCTO #6889] Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- meta/classes/sanity.bbclass | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index 31b99d4bc8..cca39c9b52 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass @@ -819,6 +819,10 @@ 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") + def check_sanity(sanity_data): import subprocess -- cgit v1.2.3