mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 00:20:08 +00:00
Code Issues Projects Releases Wiki Activity

default-distrovars: set default KERNEL_IMAGETYPE(S)

Browse Source 
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>
This commit is contained in:
California Sullivan
2018-03-29 17:41:08 -07:00
committed by Richard Purdie
parent 00cd8f2db9
commit dfd5dc1f55
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/grub-efi-cfg.bbclass
-1
View File
@@ -22,7 +22,6 @@ GRUB_CFG_LIVE = "${S}/grub_live.cfg"
GRUB_TIMEOUT ?= "10" GRUB_TIMEOUT ?= "10"
#FIXME: build this from the machine config #FIXME: build this from the machine config
GRUB_OPTS ?= "serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1" GRUB_OPTS ?= "serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1"
KERNEL_IMAGETYPE ??= "bzImage"
EFIDIR = "/EFI/BOOT" EFIDIR = "/EFI/BOOT"
GRUB_ROOT ?= "${ROOT}" GRUB_ROOT ?= "${ROOT}"
meta/classes/live-vm-common.bbclass
-2
View File
@@ -32,8 +32,6 @@ PCBIOS_CLASS = "${@['','syslinux'][d.getVar('PCBIOS') == '1']}"
inherit ${EFI_CLASS} inherit ${EFI_CLASS}
inherit ${PCBIOS_CLASS} inherit ${PCBIOS_CLASS}
KERNEL_IMAGETYPE ??= "bzImage"
populate_kernel() { populate_kernel() {
dest=$1 dest=$1
install -d $dest install -d $dest
meta/classes/syslinux.bbclass
-1
View File
@@ -21,7 +21,6 @@ do_bootimg[depends] += "${MLPREFIX}syslinux:do_populate_sysroot \
syslinux-native:do_populate_sysroot" syslinux-native:do_populate_sysroot"
ISOLINUXDIR ?= "/isolinux" ISOLINUXDIR ?= "/isolinux"
KERNEL_IMAGETYPE ??= "bzImage"
SYSLINUXDIR = "/" SYSLINUXDIR = "/"
# The kernel has an internal default console, which you can override with # The kernel has an internal default console, which you can override with
# a console=...some_tty... # a console=...some_tty...
meta/classes/systemd-boot-cfg.bbclass
-2
View File
@@ -1,5 +1,3 @@
KERNEL_IMAGETYPE ??= "bzImage"
SYSTEMD_BOOT_CFG ?= "${S}/loader.conf" SYSTEMD_BOOT_CFG ?= "${S}/loader.conf"
SYSTEMD_BOOT_ENTRIES ?= "" SYSTEMD_BOOT_ENTRIES ?= ""
SYSTEMD_BOOT_TIMEOUT ?= "10" SYSTEMD_BOOT_TIMEOUT ?= "10"
meta/conf/distro/include/default-distrovars.inc
+6
View File
@@ -47,3 +47,9 @@ BB_STRICT_CHECKSUM = "1"
GTK2DISTROFEATURES = "directfb x11" GTK2DISTROFEATURES = "directfb x11"
GTK3DISTROFEATURES = "x11 wayland" 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}"