summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2017-07-28 20:14:32 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-07-30 08:46:20 +0100
commit9d07c736e39a9aa922630b4241eda185a19a11ea (patch)
treeed423305c18dc7bac77ca01e8621ffd40f976b79 /meta/recipes-core
parentd2ebee7c3a0c8ab9a09ebad12a2fda51f8d10954 (diff)
downloadpoky-9d07c736e39a9aa922630b4241eda185a19a11ea.tar.gz
image: Convert vmdk/vdi/qcow2 to strict CONVERSION_CMD types
The vmdk/vdi/qcow2 IMAGE_FSTYPEs predate wic. As such, they provide some similar underlying functionality in order to produce a "disk" image that in turn can be converted into different formats that various hypervisor types work with. They do not however provide the ability for other disk image types to be converted into these same output types. Furthermore, they are less flexible than what wic does provide. This drops the old style vmdk/vdi/qcow2 types and re-introduces them under the CONVERSION_CMD framework. The equivalent of vmdk is now wic.vmdk and so forth for the other types. (From OE-Core rev: 929ba563f1bc7195c4981b8e139c432b2cc388ea) Signed-off-by: Tom Rini <trini@konsulko.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/images/build-appliance-image_15.0.0.bb6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-core/images/build-appliance-image_15.0.0.bb b/meta/recipes-core/images/build-appliance-image_15.0.0.bb
index f145b5e656..927a9310ac 100644
--- a/meta/recipes-core/images/build-appliance-image_15.0.0.bb
+++ b/meta/recipes-core/images/build-appliance-image_15.0.0.bb
@@ -19,7 +19,7 @@ IMAGE_ROOTFS_EXTRA_SPACE = "41943040"
19APPEND += "rootfstype=ext4 quiet" 19APPEND += "rootfstype=ext4 quiet"
20 20
21DEPENDS = "zip-native python3-pip-native" 21DEPENDS = "zip-native python3-pip-native"
22IMAGE_FSTYPES = "vmdk" 22IMAGE_FSTYPES = "wic.vmdk"
23 23
24inherit core-image module-base setuptools3 24inherit core-image module-base setuptools3
25 25
@@ -120,7 +120,7 @@ create_bundle_files () {
120 cd ${WORKDIR} 120 cd ${WORKDIR}
121 mkdir -p Yocto_Build_Appliance 121 mkdir -p Yocto_Build_Appliance
122 cp *.vmx* Yocto_Build_Appliance 122 cp *.vmx* Yocto_Build_Appliance
123 ln -sf ${IMGDEPLOYDIR}/${IMAGE_NAME}.vmdk Yocto_Build_Appliance/Yocto_Build_Appliance.vmdk 123 ln -sf ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.wic.vmdk Yocto_Build_Appliance/Yocto_Build_Appliance.vmdk
124 zip -r ${IMGDEPLOYDIR}/Yocto_Build_Appliance-${DATETIME}.zip Yocto_Build_Appliance 124 zip -r ${IMGDEPLOYDIR}/Yocto_Build_Appliance-${DATETIME}.zip Yocto_Build_Appliance
125 ln -sf Yocto_Build_Appliance-${DATETIME}.zip ${IMGDEPLOYDIR}/Yocto_Build_Appliance.zip 125 ln -sf Yocto_Build_Appliance-${DATETIME}.zip ${IMGDEPLOYDIR}/Yocto_Build_Appliance.zip
126} 126}
@@ -130,4 +130,4 @@ python do_bundle_files() {
130 bb.build.exec_func('create_bundle_files', d) 130 bb.build.exec_func('create_bundle_files', d)
131} 131}
132 132
133addtask bundle_files after do_vmimg before do_image_complete 133addtask bundle_files after do_image_wic before do_image_complete