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:51 +0000 |
| commit | bb1c719250cecc8725147cbdd999a9a44a11b549 (patch) | |
| tree | 87c69fe8fe2c254d87dbf09b47fba74b9c8a8928 /meta/classes/image-vm.bbclass | |
| parent | 5c5c13d77783e96b9acbbe460bf7060722f436cb (diff) | |
| download | poky-bb1c719250cecc8725147cbdd999a9a44a11b549.tar.gz | |
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]
(From OE-Core rev: e38c94d6bf83ed3ca7f046d9503e81b927487bf2)
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>
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 @@ | |||
| 1 | 1 | ||
| 2 | SYSLINUX_PROMPT ?= "0" | 2 | SYSLINUX_LABELS_VM ?= "boot" |
| 3 | SYSLINUX_LABELS = "boot" | 3 | LABELS_VM ?= "${SYSLINUX_LABELS_VM}" |
| 4 | LABELS_append = " ${SYSLINUX_LABELS} " | ||
| 5 | 4 | ||
| 6 | # Using an initramfs is optional. Enable it by setting INITRD_IMAGE. | 5 | # Using an initramfs is optional. Enable it by setting INITRD_IMAGE_VM. |
| 7 | INITRD_IMAGE ?= "" | 6 | INITRD_IMAGE_VM ?= "" |
| 8 | INITRD ?= "${@'${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE}-${MACHINE}.cpio.gz' if '${INITRD_IMAGE}' else ''}" | 7 | INITRD_VM ?= "${@'${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE_VM}-${MACHINE}.cpio.gz' if '${INITRD_IMAGE_VM}' else ''}" |
| 9 | do_bootdirectdisk[depends] += "${@'${INITRD_IMAGE}:do_image_complete' if '${INITRD_IMAGE}' else ''}" | 8 | do_bootdirectdisk[depends] += "${@'${INITRD_IMAGE_VM}:do_image_complete' if '${INITRD_IMAGE_VM}' else ''}" |
| 10 | 9 | ||
| 11 | # need to define the dependency and the ROOTFS for directdisk | 10 | # need to define the dependency and the ROOTFS for directdisk |
| 12 | do_bootdirectdisk[depends] += "${PN}:do_image_ext4" | 11 | do_bootdirectdisk[depends] += "${PN}:do_image_ext4" |
| 13 | ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.ext4" | 12 | ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.ext4" |
| 14 | 13 | ||
| 15 | # creating VM images relies on having a hddimg so ensure we inherit it here. | 14 | # creating VM images relies on having a hdddirect so ensure we inherit it here. |
| 16 | inherit boot-directdisk | 15 | inherit boot-directdisk |
| 17 | 16 | ||
| 18 | IMAGE_TYPEDEP_vmdk = "ext4" | 17 | IMAGE_TYPEDEP_vmdk = "ext4" |