| Submitter | Saul Wold |
|---|---|
| Date | March 26, 2012, 6:47 a.m. |
| Message ID | <6a68cf7d22e94be417215b12cac4cf1c5b9baefa.1332744104.git.sgw@linux.intel.com> |
| Download | mbox | patch |
| Permalink | /patch/24513/ |
| State | Accepted |
| Commit | 0f8a33cfa254f59bb87fe4a6727e329b0772551a |
| Headers | show |
Comments
The conversion to directdisk is necessary due to the limitation in the mkdosfs version we carry and larger filesystems. Please note in the commit message so readers can know WHY the change was made. On 03/25/2012 11:47 PM, Saul Wold wrote: > Signed-off-by: Saul Wold <sgw@linux.intel.com> > --- > 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 9d596cd..736d1d7 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 A development artifact I presume? No need to leave the old image type commented out. Should probably also remove the comment as with directdisk that is no longer the case - right? > +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 Ditto. > +addtask vmdkimg after do_bootdirectdisk before do_build > do_vmdkimg[nostamp] = "1" > > do_vmdkimg[depends] += "qemu-native:do_populate_sysroot" Thanks,
Patch
diff --git a/meta/classes/image-vmdk.bbclass b/meta/classes/image-vmdk.bbclass index 9d596cd..736d1d7 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"
Signed-off-by: Saul Wold <sgw@linux.intel.com> --- meta/classes/image-vmdk.bbclass | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-)