diff options
Diffstat (limited to 'meta/classes/image-vmdk.bbclass')
| -rw-r--r-- | meta/classes/image-vmdk.bbclass | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/meta/classes/image-vmdk.bbclass b/meta/classes/image-vmdk.bbclass index 9d596cda69..736d1d79b2 100644 --- a/meta/classes/image-vmdk.bbclass +++ b/meta/classes/image-vmdk.bbclass | |||
| @@ -1,15 +1,23 @@ | |||
| 1 | 1 | ||
| 2 | NOISO = "1" | 2 | NOISO = "1" |
| 3 | |||
| 4 | SYSLINUX_ROOT = "root=/dev/hda2 " | ||
| 3 | SYSLINUX_PROMPT = "0" | 5 | SYSLINUX_PROMPT = "0" |
| 4 | SYSLINUX_TIMEOUT = "1" | 6 | SYSLINUX_TIMEOUT = "1" |
| 5 | SYSLINUX_LABELS = "boot" | 7 | SYSLINUX_LABELS = "boot" |
| 8 | LABELS_append = " ${SYSLINUX_LABELS} " | ||
| 9 | |||
| 10 | # need to define the dependency and the ROOTFS for directdisk | ||
| 11 | do_bootdirectdisk[depends] += "${IMAGE_BASENAME}:do_rootfs" | ||
| 12 | ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.ext3" | ||
| 6 | 13 | ||
| 7 | # creating VMDK relies on having a live hddimg so ensure we | 14 | # creating VMDK relies on having a live hddimg so ensure we |
| 8 | # inherit it here. | 15 | # inherit it here. |
| 9 | inherit image-live | 16 | #inherit image-live |
| 17 | inherit boot-directdisk | ||
| 10 | 18 | ||
| 11 | create_vmdk_image () { | 19 | create_vmdk_image () { |
| 12 | qemu-img convert -O vmdk ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.hddimg ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.vmdk | 20 | qemu-img convert -O vmdk ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.hdddirect ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.vmdk |
| 13 | ln -s ${IMAGE_NAME}.vmdk ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.vmdk | 21 | ln -s ${IMAGE_NAME}.vmdk ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.vmdk |
| 14 | 22 | ||
| 15 | } | 23 | } |
| @@ -18,7 +26,8 @@ python do_vmdkimg() { | |||
| 18 | bb.build.exec_func('create_vmdk_image', d) | 26 | bb.build.exec_func('create_vmdk_image', d) |
| 19 | } | 27 | } |
| 20 | 28 | ||
| 21 | addtask vmdkimg after do_bootimg before do_build | 29 | #addtask vmdkimg after do_bootimg before do_build |
| 30 | addtask vmdkimg after do_bootdirectdisk before do_build | ||
| 22 | do_vmdkimg[nostamp] = "1" | 31 | do_vmdkimg[nostamp] = "1" |
| 23 | 32 | ||
| 24 | do_vmdkimg[depends] += "qemu-native:do_populate_sysroot" | 33 | do_vmdkimg[depends] += "qemu-native:do_populate_sysroot" |
