diff options
author | California Sullivan <california.l.sullivan@intel.com> | 2018-03-29 17:41:08 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-31 09:48:42 +0100 |
commit | dfd5dc1f55bd75068f2a459f67778d23cefc95a4 (patch) | |
tree | 0347124e73925cc355fc9a3a7f33ba7efdc160c3 /meta/classes/grub-efi-cfg.bbclass | |
parent | 00cd8f2db92d504f473492dcda5ef6eaa70d200a (diff) | |
download | poky-dfd5dc1f55bd75068f2a459f67778d23cefc95a4.tar.gz |
default-distrovars: set default KERNEL_IMAGETYPE(S)
With the change from assuming kernels will be named "vmlinuz"
everywhere, to instead using KERNEL_IMAGETYPE, we require that
KERNEL_IMAGETYPE is set to something. Instead of setting the default in
multiple individual files, set it in default-distrovars.inc.
x86(-64) arches get bzImage as the default. Others get zImage as per
meta/conf/documentation.conf.
Also set KERNEL_IMAGETYPES, as we will eventually be switching away from
KERNEL_IMAGETYPE.
Thanks to Andre McCurdy <armccurdy@gmail.com> for the arch defaults
part.
(From OE-Core rev: a57d784211a39587538094425ee0246e9ddfbf9d)
Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/grub-efi-cfg.bbclass')
-rw-r--r-- | meta/classes/grub-efi-cfg.bbclass | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/meta/classes/grub-efi-cfg.bbclass b/meta/classes/grub-efi-cfg.bbclass index d2226af97a..5eeee6c2e3 100644 --- a/meta/classes/grub-efi-cfg.bbclass +++ b/meta/classes/grub-efi-cfg.bbclass | |||
@@ -22,7 +22,6 @@ GRUB_CFG_LIVE = "${S}/grub_live.cfg" | |||
22 | GRUB_TIMEOUT ?= "10" | 22 | GRUB_TIMEOUT ?= "10" |
23 | #FIXME: build this from the machine config | 23 | #FIXME: build this from the machine config |
24 | GRUB_OPTS ?= "serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1" | 24 | GRUB_OPTS ?= "serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1" |
25 | KERNEL_IMAGETYPE ??= "bzImage" | ||
26 | 25 | ||
27 | EFIDIR = "/EFI/BOOT" | 26 | EFIDIR = "/EFI/BOOT" |
28 | GRUB_ROOT ?= "${ROOT}" | 27 | GRUB_ROOT ?= "${ROOT}" |