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-30 09:38:41 +0100 |
commit | a57d784211a39587538094425ee0246e9ddfbf9d (patch) | |
tree | 6f2820ed023df6a850bb4064d07368cf1354b0c1 /meta/classes | |
parent | 7068024c1ee8a3ec03904d50860fc42d7c421f87 (diff) | |
download | openembedded-core-contrib-a57d784211a39587538094425ee0246e9ddfbf9d.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.
Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/grub-efi-cfg.bbclass | 1 | ||||
-rw-r--r-- | meta/classes/live-vm-common.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/syslinux.bbclass | 1 | ||||
-rw-r--r-- | meta/classes/systemd-boot-cfg.bbclass | 2 |
4 files changed, 0 insertions, 6 deletions
diff --git a/meta/classes/grub-efi-cfg.bbclass b/meta/classes/grub-efi-cfg.bbclass index d2226af97a7..5eeee6c2e3f 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}" diff --git a/meta/classes/live-vm-common.bbclass b/meta/classes/live-vm-common.bbclass index 714d6d4788c..68105d9b84f 100644 --- a/meta/classes/live-vm-common.bbclass +++ b/meta/classes/live-vm-common.bbclass @@ -32,8 +32,6 @@ PCBIOS_CLASS = "${@['','syslinux'][d.getVar('PCBIOS') == '1']}" inherit ${EFI_CLASS} inherit ${PCBIOS_CLASS} -KERNEL_IMAGETYPE ??= "bzImage" - populate_kernel() { dest=$1 install -d $dest diff --git a/meta/classes/syslinux.bbclass b/meta/classes/syslinux.bbclass index 959aed4fb8f..031dacbf7d3 100644 --- a/meta/classes/syslinux.bbclass +++ b/meta/classes/syslinux.bbclass @@ -21,7 +21,6 @@ do_bootimg[depends] += "${MLPREFIX}syslinux:do_populate_sysroot \ syslinux-native:do_populate_sysroot" ISOLINUXDIR ?= "/isolinux" -KERNEL_IMAGETYPE ??= "bzImage" SYSLINUXDIR = "/" # The kernel has an internal default console, which you can override with # a console=...some_tty... diff --git a/meta/classes/systemd-boot-cfg.bbclass b/meta/classes/systemd-boot-cfg.bbclass index 107758548c6..021c9f93315 100644 --- a/meta/classes/systemd-boot-cfg.bbclass +++ b/meta/classes/systemd-boot-cfg.bbclass @@ -1,5 +1,3 @@ -KERNEL_IMAGETYPE ??= "bzImage" - SYSTEMD_BOOT_CFG ?= "${S}/loader.conf" SYSTEMD_BOOT_ENTRIES ?= "" SYSTEMD_BOOT_TIMEOUT ?= "10" |