summaryrefslogtreecommitdiff
path: root/meta/classes/bootimg.bbclass
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-06 11:36:39 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-07 17:09:23 +0000
commit77cd2ef06bdf701b047c4f8c817b364b8b4b8837 (patch)
tree431986d5db8e4f803bcd5e1aa361c2f82f8e5d6d /meta/classes/bootimg.bbclass
parent4578b708ada1ffb99ab542da793977ffb90a9b50 (diff)
downloadopenembedded-core-77cd2ef06bdf701b047c4f8c817b364b8b4b8837.tar.gz
openembedded-core-77cd2ef06bdf701b047c4f8c817b364b8b4b8837.tar.bz2
openembedded-core-77cd2ef06bdf701b047c4f8c817b364b8b4b8837.zip
bootimg: Remove now unnecessary dummy inherit usage
bitbake now supports empty expansions for inherit usage so we can simplify these statements. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/bootimg.bbclass')
-rw-r--r--meta/classes/bootimg.bbclass4
1 files changed, 2 insertions, 2 deletions
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)}"