diff options
| author | Robert Yang <liezhi.yang@windriver.com> | 2016-02-24 01:23:58 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-02 23:08:07 +0000 |
| commit | e38c94d6bf83ed3ca7f046d9503e81b927487bf2 (patch) | |
| tree | b2c3194e2d1dd26d796629a8804d0a70ee1a57ba /meta/classes/image-vm.bbclass | |
| parent | 41d0e4d75f13b53a6c1b6a8df9be4742be7534e0 (diff) | |
| download | openembedded-core-e38c94d6bf83ed3ca7f046d9503e81b927487bf2.tar.gz openembedded-core-e38c94d6bf83ed3ca7f046d9503e81b927487bf2.tar.bz2 openembedded-core-e38c94d6bf83ed3ca7f046d9503e81b927487bf2.zip | |
syslinux.bbclass: make vm and live can be built together
* The vm image(hdddirect, vmdk, qcow2, vdi) and live image (hddimg, iso)
couldn't be built together because the following vars settings are
conflicted:
- SYSLINUX_ROOT (/dev/sda2 vs /dev/ram0)
- LABELS (boot vs boot install)
- INITRD (None vs live install)
- SYSLINUX_CFG (see above)
Introduce new vars (SYSLINUX_ROOT_VM/_LIVE, the samilar to others) to
make them can work together, now we can build all of them together:
IMAGE_FSTYPES += "live iso hddimg hdddirect vmdk qcow2 vdi"
* Use SYSLINUX_CFG rather than SYSLINUXCFG to keep align with others
SYSLINUX vars.
* The SYSLINUX_TIMEOUT had been set, but it didn't work since
AUTO_SYSLINUXMENU wasn't set, this would cause confusions, so also set
AUTO_SYSLINUXMENU.
* Move SYSLINUX_PROMPT and SYSLINUX_TIMEOUT to syslinux.bbclass rather
than in separate classes since they are the same.
* Set SYSLINUX_TIMEOUT to 50 to have a unique timeout for syslinux.
[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/image-vm.bbclass')
| -rw-r--r-- | meta/classes/image-vm.bbclass | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/meta/classes/image-vm.bbclass b/meta/classes/image-vm.bbclass index 6f3a55b263..17e87a5a87 100644 --- a/meta/classes/image-vm.bbclass +++ b/meta/classes/image-vm.bbclass @@ -1,18 +1,17 @@ -SYSLINUX_PROMPT ?= "0" -SYSLINUX_LABELS = "boot" -LABELS_append = " ${SYSLINUX_LABELS} " +SYSLINUX_LABELS_VM ?= "boot" +LABELS_VM ?= "${SYSLINUX_LABELS_VM}" -# Using an initramfs is optional. Enable it by setting INITRD_IMAGE. -INITRD_IMAGE ?= "" -INITRD ?= "${@'${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE}-${MACHINE}.cpio.gz' if '${INITRD_IMAGE}' else ''}" -do_bootdirectdisk[depends] += "${@'${INITRD_IMAGE}:do_image_complete' if '${INITRD_IMAGE}' else ''}" +# Using an initramfs is optional. Enable it by setting INITRD_IMAGE_VM. +INITRD_IMAGE_VM ?= "" +INITRD_VM ?= "${@'${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE_VM}-${MACHINE}.cpio.gz' if '${INITRD_IMAGE_VM}' else ''}" +do_bootdirectdisk[depends] += "${@'${INITRD_IMAGE_VM}:do_image_complete' if '${INITRD_IMAGE_VM}' else ''}" # need to define the dependency and the ROOTFS for directdisk do_bootdirectdisk[depends] += "${PN}:do_image_ext4" ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.ext4" -# creating VM images relies on having a hddimg so ensure we inherit it here. +# creating VM images relies on having a hdddirect so ensure we inherit it here. inherit boot-directdisk IMAGE_TYPEDEP_vmdk = "ext4" |