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 <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2012-12-06 11:36:39 +00:00
parent f42e0ae8d7
commit e3c2952766
2 changed files with 2 additions and 4 deletions

View File

@@ -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)}"

View File

@@ -1,2 +0,0 @@
# An empty bbclass to facilitate dynamic inherit, include,
# and require statements.