diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-12-06 11:36:39 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-12-07 17:13:12 +0000 |
commit | e3c2952766c1268afe8928295c02b2b17c5cc78a (patch) | |
tree | b385f96e9291798ef5213f643bfdc69d9edc9d49 /meta/classes/bootimg.bbclass | |
parent | f42e0ae8d743fed9c6e082c6bd767696f82de24d (diff) | |
download | poky-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/bootimg.bbclass')
-rw-r--r-- | meta/classes/bootimg.bbclass | 4 |
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" | |||
36 | BOOTIMG_EXTRA_SPACE ?= "512" | 36 | BOOTIMG_EXTRA_SPACE ?= "512" |
37 | 37 | ||
38 | EFI = "${@base_contains("MACHINE_FEATURES", "efi", "1", "0", d)}" | 38 | EFI = "${@base_contains("MACHINE_FEATURES", "efi", "1", "0", d)}" |
39 | EFI_CLASS = "${@base_contains("MACHINE_FEATURES", "efi", "grub-efi", "dummy", d)}" | 39 | EFI_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): | |||
50 | def pcbios_class(d): | 50 | def 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 | ||
55 | PCBIOS = "${@pcbios(d)}" | 55 | PCBIOS = "${@pcbios(d)}" |
56 | PCBIOS_CLASS = "${@pcbios_class(d)}" | 56 | PCBIOS_CLASS = "${@pcbios_class(d)}" |