diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2015-03-18 19:14:49 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-03-22 08:50:02 +0000 |
commit | 72ead278876fbed55b0403732b0b840ca41212d1 (patch) | |
tree | 5472c46e6001ccb259fdd33ffcde38c5e4a005c0 | |
parent | 38aff0dc0fc7b814fd642a405b910209b2d3effa (diff) | |
download | poky-72ead278876fbed55b0403732b0b840ca41212d1.tar.gz |
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]
(From OE-Core rev: 521737f456b6ea7f7f153132c77cb74c08f088dc)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/sanity.bbclass | 4 |
1 files changed, 4 insertions, 0 deletions
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): | |||
819 | with open(checkfile, "w") as f: | 819 | with open(checkfile, "w") as f: |
820 | f.write(tmpdir) | 820 | f.write(tmpdir) |
821 | 821 | ||
822 | # Check vmdk and live can't be built together. | ||
823 | if 'vmdk' in d.getVar('IMAGE_FSTYPES', True) and 'live' in d.getVar('IMAGE_FSTYPES', True): | ||
824 | status.addresult("Error, IMAGE_FSTYPES vmdk and live can't be built together\n") | ||
825 | |||
822 | def check_sanity(sanity_data): | 826 | def check_sanity(sanity_data): |
823 | import subprocess | 827 | import subprocess |
824 | 828 | ||