summaryrefslogtreecommitdiffstats
path: root/meta/classes
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:13:12 +0000
commite3c2952766c1268afe8928295c02b2b17c5cc78a (patch)
treeb385f96e9291798ef5213f643bfdc69d9edc9d49 /meta/classes
parentf42e0ae8d743fed9c6e082c6bd767696f82de24d (diff)
downloadpoky-e3c2952766c1268afe8928295c02b2b17c5cc78a.tar.gz
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>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/bootimg.bbclass4
-rw-r--r--meta/classes/dummy.bbclass2
2 files changed, 2 insertions, 4 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"
36BOOTIMG_EXTRA_SPACE ?= "512" 36BOOTIMG_EXTRA_SPACE ?= "512"
37 37
38EFI = "${@base_contains("MACHINE_FEATURES", "efi", "1", "0", d)}" 38EFI = "${@base_contains("MACHINE_FEATURES", "efi", "1", "0", d)}"
39EFI_CLASS = "${@base_contains("MACHINE_FEATURES", "efi", "grub-efi", "dummy", d)}" 39EFI_CLASS = "${@base_contains("MACHINE_FEATURES", "efi", "grub-efi", "", d)}"
40 40
41# Include legacy boot if MACHINE_FEATURES includes "pcbios" or if it does not 41# Include legacy boot if MACHINE_FEATURES includes "pcbios" or if it does not
42# contain "efi". This way legacy is supported by default if neither is 42# contain "efi". This way legacy is supported by default if neither is
@@ -50,7 +50,7 @@ def pcbios(d):
50def pcbios_class(d): 50def pcbios_class(d):
51 if d.getVar("PCBIOS", True) == "1": 51 if d.getVar("PCBIOS", True) == "1":
52 return "syslinux" 52 return "syslinux"
53 return "dummy" 53 return ""
54 54
55PCBIOS = "${@pcbios(d)}" 55PCBIOS = "${@pcbios(d)}"
56PCBIOS_CLASS = "${@pcbios_class(d)}" 56PCBIOS_CLASS = "${@pcbios_class(d)}"
diff --git a/meta/classes/dummy.bbclass b/meta/classes/dummy.bbclass
deleted file mode 100644
index 8c300717d0..0000000000
--- a/meta/classes/dummy.bbclass
+++ /dev/null
@@ -1,2 +0,0 @@
1# An empty bbclass to facilitate dynamic inherit, include,
2# and require statements.