diff options
Diffstat (limited to 'meta/classes/image-live.bbclass')
-rw-r--r-- | meta/classes/image-live.bbclass | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/image-live.bbclass b/meta/classes/image-live.bbclass index 4a634dca96..a3d1b4e567 100644 --- a/meta/classes/image-live.bbclass +++ b/meta/classes/image-live.bbclass | |||
@@ -51,8 +51,8 @@ IMAGE_TYPEDEP_hddimg = "ext4" | |||
51 | IMAGE_TYPES_MASKED += "live hddimg iso" | 51 | IMAGE_TYPES_MASKED += "live hddimg iso" |
52 | 52 | ||
53 | python() { | 53 | python() { |
54 | image_b = d.getVar('IMAGE_BASENAME', True) | 54 | image_b = d.getVar('IMAGE_BASENAME') |
55 | initrd_i = d.getVar('INITRD_IMAGE_LIVE', True) | 55 | initrd_i = d.getVar('INITRD_IMAGE_LIVE') |
56 | if image_b == initrd_i: | 56 | if image_b == initrd_i: |
57 | bb.error('INITRD_IMAGE_LIVE %s cannot use image live, hddimg or iso.' % initrd_i) | 57 | bb.error('INITRD_IMAGE_LIVE %s cannot use image live, hddimg or iso.' % initrd_i) |
58 | bb.fatal('Check IMAGE_FSTYPES and INITRAMFS_FSTYPES settings.') | 58 | bb.fatal('Check IMAGE_FSTYPES and INITRAMFS_FSTYPES settings.') |
@@ -264,9 +264,9 @@ build_hddimg() { | |||
264 | 264 | ||
265 | python do_bootimg() { | 265 | python do_bootimg() { |
266 | set_live_vm_vars(d, 'LIVE') | 266 | set_live_vm_vars(d, 'LIVE') |
267 | if d.getVar("PCBIOS", True) == "1": | 267 | if d.getVar("PCBIOS") == "1": |
268 | bb.build.exec_func('build_syslinux_cfg', d) | 268 | bb.build.exec_func('build_syslinux_cfg', d) |
269 | if d.getVar("EFI", True) == "1": | 269 | if d.getVar("EFI") == "1": |
270 | bb.build.exec_func('build_efi_cfg', d) | 270 | bb.build.exec_func('build_efi_cfg', d) |
271 | bb.build.exec_func('build_hddimg', d) | 271 | bb.build.exec_func('build_hddimg', d) |
272 | bb.build.exec_func('build_iso', d) | 272 | bb.build.exec_func('build_iso', d) |