mirror of
https://git.yoctoproject.org/poky
synced 2026-02-07 09:16:36 +01:00
bb1c719250
* 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>
29 lines
938 B
Plaintext
29 lines
938 B
Plaintext
|
|
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"
|
|
|
|
do_bootimg[depends] += "${PN}:do_image_ext4"
|
|
|
|
inherit bootimg
|
|
|
|
IMAGE_TYPEDEP_live = "ext4"
|
|
IMAGE_TYPEDEP_iso = "ext4"
|
|
IMAGE_TYPEDEP_hddimg = "ext4"
|
|
IMAGE_TYPES_MASKED += "live hddimg iso"
|
|
|
|
python() {
|
|
image_b = d.getVar('IMAGE_BASENAME', True)
|
|
initrd_i = d.getVar('INITRD_IMAGE_LIVE', True)
|
|
if image_b == 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)
|
|
}
|