mirror of
https://git.yoctoproject.org/poky
synced 2026-02-06 16:56:37 +01:00
be98ee879f
Don't force SYSLINUX_TIMEOUT and SYSLINUX_PROMPT if overrides have been defined elsewhere for an image configuration. (From OE-Core rev: a6522c19af9525a6e0bed241f2d926faaef76827) Signed-off-by: Kyle Russell <bkylerussell@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
36 lines
968 B
Plaintext
36 lines
968 B
Plaintext
|
|
#NOISO = "1"
|
|
|
|
SYSLINUX_ROOT = "root=/dev/hda2 "
|
|
SYSLINUX_PROMPT ?= "0"
|
|
SYSLINUX_TIMEOUT ?= "1"
|
|
SYSLINUX_LABELS = "boot"
|
|
LABELS_append = " ${SYSLINUX_LABELS} "
|
|
|
|
# need to define the dependency and the ROOTFS for directdisk
|
|
do_bootdirectdisk[depends] += "${PN}:do_rootfs"
|
|
ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.ext3"
|
|
|
|
# creating VMDK relies on having a live hddimg so ensure we
|
|
# inherit it here.
|
|
#inherit image-live
|
|
inherit boot-directdisk
|
|
|
|
IMAGE_TYPEDEP_vmdk = "ext3"
|
|
IMAGE_TYPES_MASKED += "vmdk"
|
|
|
|
create_vmdk_image () {
|
|
qemu-img convert -O vmdk ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.hdddirect ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.vmdk
|
|
ln -sf ${IMAGE_NAME}.vmdk ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.vmdk
|
|
}
|
|
|
|
python do_vmdkimg() {
|
|
bb.build.exec_func('create_vmdk_image', d)
|
|
}
|
|
|
|
#addtask vmdkimg after do_bootimg before do_build
|
|
addtask vmdkimg after do_bootdirectdisk before do_build
|
|
|
|
do_vmdkimg[depends] += "qemu-native:do_populate_sysroot"
|
|
|