diff options
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" |