summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorJuro Bystricky <juro.bystricky@intel.com>2015-06-03 11:07:23 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-11 23:59:13 +0100
commita13c51e751ee76c990fe83f83544e448c6cf543d (patch)
tree0612be3f76df8f4fe2cc2e5ff48bec176bc05469 /meta/lib
parentd59d876f447c961149763e585c012ac2f0f7b788 (diff)
downloadpoky-a13c51e751ee76c990fe83f83544e448c6cf543d.tar.gz
image: Support for VDI
Added support for VirtualBox VDI format. The support was implemented by merging with the already existing VMDK support for VM player by creating a new class image-vm.bbclass. This class replaces the previous VMDK only image-vmdk.class. (From OE-Core rev: 0a3e8eb9f592c3f1edd2c7521855f7406541651a) Signed-off-by: Juro Bystricky <juro.bystricky@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oe/image.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oe/image.py b/meta/lib/oe/image.py
index 0ce303d570..40f61515eb 100644
--- a/meta/lib/oe/image.py
+++ b/meta/lib/oe/image.py
@@ -66,7 +66,7 @@ class ImageDepGraph(object):
66 return graph 66 return graph
67 67
68 def _clean_graph(self): 68 def _clean_graph(self):
69 # Live and VMDK images will be processed via inheriting 69 # Live and VMDK/VDI images will be processed via inheriting
70 # bbclass and does not get processed here. Remove them from the fstypes 70 # bbclass and does not get processed here. Remove them from the fstypes
71 # graph. Their dependencies are already added, so no worries here. 71 # graph. Their dependencies are already added, so no worries here.
72 remove_list = (self.d.getVar('IMAGE_TYPES_MASKED', True) or "").split() 72 remove_list = (self.d.getVar('IMAGE_TYPES_MASKED', True) or "").split()
@@ -76,7 +76,7 @@ class ImageDepGraph(object):
76 76
77 def _image_base_type(self, type): 77 def _image_base_type(self, type):
78 ctypes = self.d.getVar('COMPRESSIONTYPES', True).split() 78 ctypes = self.d.getVar('COMPRESSIONTYPES', True).split()
79 if type in ["vmdk", "live", "iso", "hddimg"]: 79 if type in ["vmdk", "vdi", "live", "iso", "hddimg"]:
80 type = "ext3" 80 type = "ext3"
81 basetype = type 81 basetype = type
82 for ctype in ctypes: 82 for ctype in ctypes: