From patchwork Thu Dec  6 11:36:39 2012
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: bootimg: Remove now unnecessary dummy inherit usage
Date: Thu, 06 Dec 2012 11:36:39 -0000
From: Richard Purdie <richard.purdie@linuxfoundation.org>
X-Patchwork-Id: 40563
Message-Id: <1354793799.25268.172.camel@ted>
To: openembedded-core <openembedded-core@lists.openembedded.org>

bitbake now supports empty expansions for inherit usage so we can simplify
these statements.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

---


diff --git a/meta/classes/bootimg.bbclass b/meta/classes/bootimg.bbclass
index 11a29cd..17c329a 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)}"
diff --git a/meta/classes/dummy.bbclass b/meta/classes/dummy.bbclass
deleted file mode 100644
index 8c30071..0000000
--- a/meta/classes/dummy.bbclass
+++ /dev/null
@@ -1,2 +0,0 @@
-# An empty bbclass to facilitate dynamic inherit, include,
-# and require statements.