summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-02-28 08:45:55 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-28 17:51:51 +0000
commit7f67843c322caa9361036073b95cac209454147e (patch)
tree2e0dfa8e46b6a5e13fb20a628ae3519407842d23
parent2684714480efa1aabdbfd595915a653a97322073 (diff)
downloadpoky-7f67843c322caa9361036073b95cac209454147e.tar.gz
bootimg: Fix Quoting
(From OE-Core rev: 18ad7e003e36510ff0097d71bad0378a77fabbdd) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/bootimg.bbclass8
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/bootimg.bbclass b/meta/classes/bootimg.bbclass
index 1d1a3d04af..f4981d8e37 100644
--- a/meta/classes/bootimg.bbclass
+++ b/meta/classes/bootimg.bbclass
@@ -35,8 +35,8 @@ ISODIR = "${S}/iso"
35BOOTIMG_VOLUME_ID ?= "boot" 35BOOTIMG_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", "dummy", 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
@@ -52,8 +52,8 @@ def pcbios_class(d):
52 return "syslinux" 52 return "syslinux"
53 return "dummy" 53 return "dummy"
54 54
55PCBIOS = ${@pcbios(d)} 55PCBIOS = "${@pcbios(d)}"
56PCBIOS_CLASS = ${@pcbios_class(d)} 56PCBIOS_CLASS = "${@pcbios_class(d)}"
57 57
58inherit ${PCBIOS_CLASS} 58inherit ${PCBIOS_CLASS}
59inherit ${EFI_CLASS} 59inherit ${EFI_CLASS}