bootimg: Remove now unnecessary dummy inherit usage

PATCH New Richard Purdie 1 participant 1 message Dec 6, 2012

lore

Share & tools

lore

Richard Purdie

author

2012-12-06 11:51 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

---

meta/classes/bootimg.bbclass +2 -2

index 11a29cd..17c329a 100644
@@ -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)}"

meta/classes/dummy.bbclass deleted +0 -2

deleted file mode 100644
index 8c30071..0000000
@@ -1,2 +0,0 @@
-# An empty bbclass to facilitate dynamic inherit, include,
-# and require statements.