From e3c2952766c1268afe8928295c02b2b17c5cc78a Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 6 Dec 2012 11:36:39 +0000 Subject: bootimg: Remove now unnecessary dummy inherit usage bitbake now supports empty expansions for inherit usage so we can simplify these statements. (From OE-Core rev: 77cd2ef06bdf701b047c4f8c817b364b8b4b8837) Signed-off-by: Richard Purdie --- meta/classes/bootimg.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta/classes/bootimg.bbclass') diff --git a/meta/classes/bootimg.bbclass b/meta/classes/bootimg.bbclass index 11a29cdf2b..17c329a142 100644 --- a/meta/classes/bootimg.bbclass +++ b/meta/classes/bootimg.bbclass @@ -36,7 +36,7 @@ BOOTIMG_VOLUME_ID ?= "boot" BOOTIMG_EXTRA_SPACE ?= "512" EFI = "${@base_contains("MACHINE_FEATURES", "efi", "1", "0", d)}" -EFI_CLASS = "${@base_contains("MACHINE_FEATURES", "efi", "grub-efi", "dummy", d)}" +EFI_CLASS = "${@base_contains("MACHINE_FEATURES", "efi", "grub-efi", "", d)}" # Include legacy boot if MACHINE_FEATURES includes "pcbios" or if it does not # contain "efi". This way legacy is supported by default if neither is @@ -50,7 +50,7 @@ def pcbios(d): def pcbios_class(d): if d.getVar("PCBIOS", True) == "1": return "syslinux" - return "dummy" + return "" PCBIOS = "${@pcbios(d)}" PCBIOS_CLASS = "${@pcbios_class(d)}" -- cgit v1.2.3-54-g00ecf