diff options
Diffstat (limited to 'meta/classes/bootimg.bbclass')
-rw-r--r-- | meta/classes/bootimg.bbclass | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/meta/classes/bootimg.bbclass b/meta/classes/bootimg.bbclass index a4c0e8d931..11a29cdf2b 100644 --- a/meta/classes/bootimg.bbclass +++ b/meta/classes/bootimg.bbclass | |||
@@ -42,15 +42,15 @@ EFI_CLASS = "${@base_contains("MACHINE_FEATURES", "efi", "grub-efi", "dummy", d) | |||
42 | # contain "efi". This way legacy is supported by default if neither is | 42 | # contain "efi". This way legacy is supported by default if neither is |
43 | # specified, maintaining the original behavior. | 43 | # specified, maintaining the original behavior. |
44 | def pcbios(d): | 44 | def pcbios(d): |
45 | pcbios = base_contains("MACHINE_FEATURES", "pcbios", "1", "0", d) | 45 | pcbios = base_contains("MACHINE_FEATURES", "pcbios", "1", "0", d) |
46 | if pcbios == "0": | 46 | if pcbios == "0": |
47 | pcbios = base_contains("MACHINE_FEATURES", "efi", "0", "1", d) | 47 | pcbios = base_contains("MACHINE_FEATURES", "efi", "0", "1", d) |
48 | return pcbios | 48 | return pcbios |
49 | 49 | ||
50 | def pcbios_class(d): | 50 | def pcbios_class(d): |
51 | if d.getVar("PCBIOS", True) == "1": | 51 | if d.getVar("PCBIOS", True) == "1": |
52 | return "syslinux" | 52 | return "syslinux" |
53 | return "dummy" | 53 | return "dummy" |
54 | 54 | ||
55 | PCBIOS = "${@pcbios(d)}" | 55 | PCBIOS = "${@pcbios(d)}" |
56 | PCBIOS_CLASS = "${@pcbios_class(d)}" | 56 | PCBIOS_CLASS = "${@pcbios_class(d)}" |
@@ -181,12 +181,12 @@ build_hddimg() { | |||
181 | } | 181 | } |
182 | 182 | ||
183 | python do_bootimg() { | 183 | python do_bootimg() { |
184 | if d.getVar("PCBIOS", True) == "1": | 184 | if d.getVar("PCBIOS", True) == "1": |
185 | bb.build.exec_func('build_syslinux_cfg', d) | 185 | bb.build.exec_func('build_syslinux_cfg', d) |
186 | if d.getVar("EFI", True) == "1": | 186 | if d.getVar("EFI", True) == "1": |
187 | bb.build.exec_func('build_grub_cfg', d) | 187 | bb.build.exec_func('build_grub_cfg', d) |
188 | bb.build.exec_func('build_hddimg', d) | 188 | bb.build.exec_func('build_hddimg', d) |
189 | bb.build.exec_func('build_iso', d) | 189 | bb.build.exec_func('build_iso', d) |
190 | } | 190 | } |
191 | 191 | ||
192 | addtask bootimg before do_build | 192 | addtask bootimg before do_build |