summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-03-26 22:42:58 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-27 13:22:00 +0100
commit0f8a33cfa254f59bb87fe4a6727e329b0772551a (patch)
treead7163f7dd8e2a688ff37c46d512fb46d896ebf2 /meta
parent53ae1737611e10e7fef815e8fde9e22165aa1047 (diff)
downloadopenembedded-core-0f8a33cfa254f59bb87fe4a6727e329b0772551a.tar.gz
openembedded-core-0f8a33cfa254f59bb87fe4a6727e329b0772551a.tar.bz2
openembedded-core-0f8a33cfa254f59bb87fe4a6727e329b0772551a.zip
vmdk: Update for direstdisk
The conversion to directdisk is necessary due to the limitation in the mkdosfs version we carry and larger filesystems. Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/image-vmdk.bbclass15
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 @@
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"