From a58c37291b5b471f57e8941482e9d407d43ec299 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Mon, 26 Mar 2012 22:42:58 -0700 Subject: vmdk: Update for direstdisk The conversion to directdisk is necessary due to the limitation in the mkdosfs version we carry and larger filesystems. (From OE-Core rev: 0f8a33cfa254f59bb87fe4a6727e329b0772551a) Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/classes/image-vmdk.bbclass | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'meta/classes/image-vmdk.bbclass') 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 @@ 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] += "${IMAGE_BASENAME}: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 image-live +inherit boot-directdisk create_vmdk_image () { - qemu-img convert -O vmdk ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.hddimg ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.vmdk + qemu-img convert -O vmdk ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.hdddirect ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.vmdk ln -s ${IMAGE_NAME}.vmdk ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.vmdk } @@ -18,7 +26,8 @@ python do_vmdkimg() { bb.build.exec_func('create_vmdk_image', d) } -addtask vmdkimg after do_bootimg before do_build +#addtask vmdkimg after do_bootimg before do_build +addtask vmdkimg after do_bootdirectdisk before do_build do_vmdkimg[nostamp] = "1" do_vmdkimg[depends] += "qemu-native:do_populate_sysroot" -- cgit v1.2.3-54-g00ecf