diff options
Diffstat (limited to 'meta/classes/boot-directdisk.bbclass')
| -rw-r--r-- | meta/classes/boot-directdisk.bbclass | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/classes/boot-directdisk.bbclass b/meta/classes/boot-directdisk.bbclass index 88e5c52e2b..0da9932f4f 100644 --- a/meta/classes/boot-directdisk.bbclass +++ b/meta/classes/boot-directdisk.bbclass | |||
| @@ -31,17 +31,17 @@ EXCLUDE_FROM_WORLD = "1" | |||
| 31 | BOOTDD_VOLUME_ID ?= "boot" | 31 | BOOTDD_VOLUME_ID ?= "boot" |
| 32 | BOOTDD_EXTRA_SPACE ?= "16384" | 32 | BOOTDD_EXTRA_SPACE ?= "16384" |
| 33 | 33 | ||
| 34 | EFI = "${@base_contains("MACHINE_FEATURES", "efi", "1", "0", d)}" | 34 | EFI = "${@bb.utils.contains("MACHINE_FEATURES", "efi", "1", "0", d)}" |
| 35 | EFI_PROVIDER ?= "grub-efi" | 35 | EFI_PROVIDER ?= "grub-efi" |
| 36 | EFI_CLASS = "${@base_contains("MACHINE_FEATURES", "efi", "${EFI_PROVIDER}", "", d)}" | 36 | EFI_CLASS = "${@bb.utils.contains("MACHINE_FEATURES", "efi", "${EFI_PROVIDER}", "", d)}" |
| 37 | 37 | ||
| 38 | # Include legacy boot if MACHINE_FEATURES includes "pcbios" or if it does not | 38 | # Include legacy boot if MACHINE_FEATURES includes "pcbios" or if it does not |
| 39 | # contain "efi". This way legacy is supported by default if neither is | 39 | # contain "efi". This way legacy is supported by default if neither is |
| 40 | # specified, maintaining the original behavior. | 40 | # specified, maintaining the original behavior. |
| 41 | def pcbios(d): | 41 | def pcbios(d): |
| 42 | pcbios = base_contains("MACHINE_FEATURES", "pcbios", "1", "0", d) | 42 | pcbios = bb.utils.contains("MACHINE_FEATURES", "pcbios", "1", "0", d) |
| 43 | if pcbios == "0": | 43 | if pcbios == "0": |
| 44 | pcbios = base_contains("MACHINE_FEATURES", "efi", "0", "1", d) | 44 | pcbios = bb.utils.contains("MACHINE_FEATURES", "efi", "0", "1", d) |
| 45 | return pcbios | 45 | return pcbios |
| 46 | 46 | ||
| 47 | def pcbios_class(d): | 47 | def pcbios_class(d): |
| @@ -62,7 +62,7 @@ DISK_SIGNATURE ?= "${DISK_SIGNATURE_GENERATED}" | |||
| 62 | SYSLINUX_ROOT ?= "root=/dev/sda2" | 62 | SYSLINUX_ROOT ?= "root=/dev/sda2" |
| 63 | SYSLINUX_TIMEOUT ?= "10" | 63 | SYSLINUX_TIMEOUT ?= "10" |
| 64 | 64 | ||
| 65 | IS_VMDK = '${@base_contains("IMAGE_FSTYPES", "vmdk", "true", "false", d)}' | 65 | IS_VMDK = '${@bb.utils.contains("IMAGE_FSTYPES", "vmdk", "true", "false", d)}' |
| 66 | 66 | ||
| 67 | boot_direct_populate() { | 67 | boot_direct_populate() { |
| 68 | dest=$1 | 68 | dest=$1 |
