summaryrefslogtreecommitdiffstats
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:26:36 +0100
commita58c37291b5b471f57e8941482e9d407d43ec299 (patch)
treebcf8578b6e36202036ac8f9faa078d896918254f
parent337fbed7345ad8d2c39dab1f4353ed0524c0d906 (diff)
downloadpoky-a58c37291b5b471f57e8941482e9d407d43ec299.tar.gz
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 <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 @@
1 1
2NOISO = "1" 2NOISO = "1"
3
4SYSLINUX_ROOT = "root=/dev/hda2 "
3SYSLINUX_PROMPT = "0" 5SYSLINUX_PROMPT = "0"
4SYSLINUX_TIMEOUT = "1" 6SYSLINUX_TIMEOUT = "1"
5SYSLINUX_LABELS = "boot" 7SYSLINUX_LABELS = "boot"
8LABELS_append = " ${SYSLINUX_LABELS} "
9
10# need to define the dependency and the ROOTFS for directdisk
11do_bootdirectdisk[depends] += "${IMAGE_BASENAME}:do_rootfs"
12ROOTFS ?= "${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.
9inherit image-live 16#inherit image-live
17inherit boot-directdisk
10 18
11create_vmdk_image () { 19create_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
21addtask vmdkimg after do_bootimg before do_build 29#addtask vmdkimg after do_bootimg before do_build
30addtask vmdkimg after do_bootdirectdisk before do_build
22do_vmdkimg[nostamp] = "1" 31do_vmdkimg[nostamp] = "1"
23 32
24do_vmdkimg[depends] += "qemu-native:do_populate_sysroot" 33do_vmdkimg[depends] += "qemu-native:do_populate_sysroot"