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-live.bbclass | |
| parent | 41d0e4d75f13b53a6c1b6a8df9be4742be7534e0 (diff) | |
| download | openembedded-core-contrib-e38c94d6bf83ed3ca7f046d9503e81b927487bf2.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]
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/classes/image-live.bbclass')
| -rw-r--r-- | meta/classes/image-live.bbclass | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/meta/classes/image-live.bbclass b/meta/classes/image-live.bbclass index badf40de54..b8f21cb7a5 100644 --- a/meta/classes/image-live.bbclass +++ b/meta/classes/image-live.bbclass @@ -1,10 +1,10 @@ -INITRD_IMAGE ?= "core-image-minimal-initramfs" -INITRD ?= "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE}-${MACHINE}.cpio.gz" -SYSLINUX_ROOT ?= "root=/dev/ram0" -SYSLINUX_TIMEOUT ?= "50" -SYSLINUX_LABELS ?= "boot install" -LABELS_append = " ${SYSLINUX_LABELS} " +INITRD_IMAGE_LIVE ?= "core-image-minimal-initramfs" +INITRD_LIVE ?= "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE_LIVE}-${MACHINE}.cpio.gz" +SYSLINUX_ROOT_LIVE ?= "root=/dev/ram0" +SYSLINUX_LABELS_LIVE ?= "boot install" +LABELS_LIVE ?= "${SYSLINUX_LABELS_LIVE}" +SYSLINUX_CFG_LIVE ?= "${S}/syslinux_live.cfg" ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.ext4" @@ -19,9 +19,9 @@ IMAGE_TYPES_MASKED += "live hddimg iso" python() { image_b = d.getVar('IMAGE_BASENAME', True) - initrd_i = d.getVar('INITRD_IMAGE', True) + initrd_i = d.getVar('INITRD_IMAGE_LIVE', True) if image_b == initrd_i: - bb.error('INITRD_IMAGE %s cannot use image live, hddimg or iso.' % initrd_i) + bb.error('INITRD_IMAGE_LIVE %s cannot use image live, hddimg or iso.' % initrd_i) bb.fatal('Check IMAGE_FSTYPES and INITRAMFS_FSTYPES settings.') else: d.appendVarFlag('do_bootimg', 'depends', ' %s:do_image_complete' % initrd_i) |