[oe-commits] [openembedded-core] 04/08: default-distrovars: set default KERNEL_IMAGETYPE(S)

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit a57d784211a39587538094425ee0246e9ddfbf9d
Author: California Sullivan <california.l.sullivan at intel.com>
AuthorDate: Thu Mar 29 17:41:08 2018 -0700

    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 at gmail.com> for the arch defaults
    part.
    
    Signed-off-by: California Sullivan <california.l.sullivan at intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/classes/grub-efi-cfg.bbclass               | 1 -
 meta/classes/live-vm-common.bbclass             | 2 --
 meta/classes/syslinux.bbclass                   | 1 -
 meta/classes/systemd-boot-cfg.bbclass           | 2 --
 meta/conf/distro/include/default-distrovars.inc | 6 ++++++
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/meta/classes/grub-efi-cfg.bbclass b/meta/classes/grub-efi-cfg.bbclass
index d2226af..5eeee6c 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 714d6d4..68105d9 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 959aed4..031dacb 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 1077585..021c9f9 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"
diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc
index 76d09af..9620ad4 100644
--- a/meta/conf/distro/include/default-distrovars.inc
+++ b/meta/conf/distro/include/default-distrovars.inc
@@ -47,3 +47,9 @@ BB_STRICT_CHECKSUM = "1"
 
 GTK2DISTROFEATURES = "directfb x11"
 GTK3DISTROFEATURES = "x11 wayland"
+
+ARCH_DEFAULT_KERNELIMAGETYPE = "zImage"
+ARCH_DEFAULT_KERNELIMAGETYPE_x86 = "bzImage"
+ARCH_DEFAULT_KERNELIMAGETYPE_x86-64 = "bzImage"
+KERNEL_IMAGETYPE ??= "${ARCH_DEFAULT_KERNELIMAGETYPE}"
+KERNEL_IMAGETYPES ??= "${KERNEL_IMAGETYPE}"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.