diff options
Diffstat (limited to 'meta/classes/image-vm.bbclass')
-rw-r--r-- | meta/classes/image-vm.bbclass | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/classes/image-vm.bbclass b/meta/classes/image-vm.bbclass index 2f35d6b4d1..35c9244e9b 100644 --- a/meta/classes/image-vm.bbclass +++ b/meta/classes/image-vm.bbclass | |||
@@ -112,9 +112,9 @@ build_boot_dd() { | |||
112 | python do_bootdirectdisk() { | 112 | python do_bootdirectdisk() { |
113 | validate_disk_signature(d) | 113 | validate_disk_signature(d) |
114 | set_live_vm_vars(d, 'VM') | 114 | set_live_vm_vars(d, 'VM') |
115 | if d.getVar("PCBIOS", True) == "1": | 115 | if d.getVar("PCBIOS") == "1": |
116 | bb.build.exec_func('build_syslinux_cfg', d) | 116 | bb.build.exec_func('build_syslinux_cfg', d) |
117 | if d.getVar("EFI", True) == "1": | 117 | if d.getVar("EFI") == "1": |
118 | bb.build.exec_func('build_efi_cfg', d) | 118 | bb.build.exec_func('build_efi_cfg', d) |
119 | bb.build.exec_func('build_boot_dd', d) | 119 | bb.build.exec_func('build_boot_dd', d) |
120 | } | 120 | } |
@@ -132,7 +132,7 @@ def generate_disk_signature(): | |||
132 | def validate_disk_signature(d): | 132 | def validate_disk_signature(d): |
133 | import re | 133 | import re |
134 | 134 | ||
135 | disk_signature = d.getVar("DISK_SIGNATURE", True) | 135 | disk_signature = d.getVar("DISK_SIGNATURE") |
136 | 136 | ||
137 | if not re.match(r'^[0-9a-fA-F]{8}$', disk_signature): | 137 | if not re.match(r'^[0-9a-fA-F]{8}$', disk_signature): |
138 | bb.fatal("DISK_SIGNATURE '%s' must be an 8 digit hex string" % disk_signature) | 138 | bb.fatal("DISK_SIGNATURE '%s' must be an 8 digit hex string" % disk_signature) |
@@ -158,11 +158,11 @@ create_qcow2_image () { | |||
158 | } | 158 | } |
159 | 159 | ||
160 | python do_vmimg() { | 160 | python do_vmimg() { |
161 | if 'vmdk' in d.getVar('IMAGE_FSTYPES', True): | 161 | if 'vmdk' in d.getVar('IMAGE_FSTYPES'): |
162 | bb.build.exec_func('create_vmdk_image', d) | 162 | bb.build.exec_func('create_vmdk_image', d) |
163 | if 'vdi' in d.getVar('IMAGE_FSTYPES', True): | 163 | if 'vdi' in d.getVar('IMAGE_FSTYPES'): |
164 | bb.build.exec_func('create_vdi_image', d) | 164 | bb.build.exec_func('create_vdi_image', d) |
165 | if 'qcow2' in d.getVar('IMAGE_FSTYPES', True): | 165 | if 'qcow2' in d.getVar('IMAGE_FSTYPES'): |
166 | bb.build.exec_func('create_qcow2_image', d) | 166 | bb.build.exec_func('create_qcow2_image', d) |
167 | } | 167 | } |
168 | 168 | ||