From dfd5dc1f55bd75068f2a459f67778d23cefc95a4 Mon Sep 17 00:00:00 2001 From: California Sullivan Date: Thu, 29 Mar 2018 17:41:08 -0700 Subject: 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 for the arch defaults part. (From OE-Core rev: a57d784211a39587538094425ee0246e9ddfbf9d) Signed-off-by: California Sullivan Signed-off-by: Richard Purdie --- meta/classes/grub-efi-cfg.bbclass | 1 - 1 file changed, 1 deletion(-) (limited to 'meta/classes/grub-efi-cfg.bbclass') 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" GRUB_TIMEOUT ?= "10" #FIXME: build this from the machine config GRUB_OPTS ?= "serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1" -KERNEL_IMAGETYPE ??= "bzImage" EFIDIR = "/EFI/BOOT" GRUB_ROOT ?= "${ROOT}" -- cgit v1.2.3-54-g00ecf