diff options
Diffstat (limited to 'meta/classes/bootimg.bbclass')
| -rw-r--r-- | meta/classes/bootimg.bbclass | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/bootimg.bbclass b/meta/classes/bootimg.bbclass index b13eef965d..7678567600 100644 --- a/meta/classes/bootimg.bbclass +++ b/meta/classes/bootimg.bbclass | |||
| @@ -41,17 +41,17 @@ COMPRESSISO ?= "0" | |||
| 41 | BOOTIMG_VOLUME_ID ?= "boot" | 41 | BOOTIMG_VOLUME_ID ?= "boot" |
| 42 | BOOTIMG_EXTRA_SPACE ?= "512" | 42 | BOOTIMG_EXTRA_SPACE ?= "512" |
| 43 | 43 | ||
| 44 | EFI = "${@base_contains("MACHINE_FEATURES", "efi", "1", "0", d)}" | 44 | EFI = "${@bb.utils.contains("MACHINE_FEATURES", "efi", "1", "0", d)}" |
| 45 | EFI_PROVIDER ?= "grub-efi" | 45 | EFI_PROVIDER ?= "grub-efi" |
| 46 | EFI_CLASS = "${@base_contains("MACHINE_FEATURES", "efi", "${EFI_PROVIDER}", "", d)}" | 46 | EFI_CLASS = "${@bb.utils.contains("MACHINE_FEATURES", "efi", "${EFI_PROVIDER}", "", d)}" |
| 47 | 47 | ||
| 48 | # Include legacy boot if MACHINE_FEATURES includes "pcbios" or if it does not | 48 | # Include legacy boot if MACHINE_FEATURES includes "pcbios" or if it does not |
| 49 | # contain "efi". This way legacy is supported by default if neither is | 49 | # contain "efi". This way legacy is supported by default if neither is |
| 50 | # specified, maintaining the original behavior. | 50 | # specified, maintaining the original behavior. |
| 51 | def pcbios(d): | 51 | def pcbios(d): |
| 52 | pcbios = base_contains("MACHINE_FEATURES", "pcbios", "1", "0", d) | 52 | pcbios = bb.utils.contains("MACHINE_FEATURES", "pcbios", "1", "0", d) |
| 53 | if pcbios == "0": | 53 | if pcbios == "0": |
| 54 | pcbios = base_contains("MACHINE_FEATURES", "efi", "0", "1", d) | 54 | pcbios = bb.utils.contains("MACHINE_FEATURES", "efi", "0", "1", d) |
| 55 | return pcbios | 55 | return pcbios |
| 56 | 56 | ||
| 57 | PCBIOS = "${@pcbios(d)}" | 57 | PCBIOS = "${@pcbios(d)}" |
