summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCalifornia Sullivan <california.l.sullivan@intel.com>2018-03-29 17:41:08 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-31 09:48:42 +0100
commitdfd5dc1f55bd75068f2a459f67778d23cefc95a4 (patch)
tree0347124e73925cc355fc9a3a7f33ba7efdc160c3
parent00cd8f2db92d504f473492dcda5ef6eaa70d200a (diff)
downloadpoky-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>
-rw-r--r--meta/classes/grub-efi-cfg.bbclass1
-rw-r--r--meta/classes/live-vm-common.bbclass2
-rw-r--r--meta/classes/syslinux.bbclass1
-rw-r--r--meta/classes/systemd-boot-cfg.bbclass2
-rw-r--r--meta/conf/distro/include/default-distrovars.inc6
5 files changed, 6 insertions, 6 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"
22GRUB_TIMEOUT ?= "10" 22GRUB_TIMEOUT ?= "10"
23#FIXME: build this from the machine config 23#FIXME: build this from the machine config
24GRUB_OPTS ?= "serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1" 24GRUB_OPTS ?= "serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1"
25KERNEL_IMAGETYPE ??= "bzImage"
26 25
27EFIDIR = "/EFI/BOOT" 26EFIDIR = "/EFI/BOOT"
28GRUB_ROOT ?= "${ROOT}" 27GRUB_ROOT ?= "${ROOT}"
diff --git a/meta/classes/live-vm-common.bbclass b/meta/classes/live-vm-common.bbclass
index 714d6d4788..68105d9b84 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']}"
32inherit ${EFI_CLASS} 32inherit ${EFI_CLASS}
33inherit ${PCBIOS_CLASS} 33inherit ${PCBIOS_CLASS}
34 34
35KERNEL_IMAGETYPE ??= "bzImage"
36
37populate_kernel() { 35populate_kernel() {
38 dest=$1 36 dest=$1
39 install -d $dest 37 install -d $dest
diff --git a/meta/classes/syslinux.bbclass b/meta/classes/syslinux.bbclass
index 959aed4fb8..031dacbf7d 100644
--- a/meta/classes/syslinux.bbclass
+++ b/meta/classes/syslinux.bbclass
@@ -21,7 +21,6 @@ do_bootimg[depends] += "${MLPREFIX}syslinux:do_populate_sysroot \
21 syslinux-native:do_populate_sysroot" 21 syslinux-native:do_populate_sysroot"
22 22
23ISOLINUXDIR ?= "/isolinux" 23ISOLINUXDIR ?= "/isolinux"
24KERNEL_IMAGETYPE ??= "bzImage"
25SYSLINUXDIR = "/" 24SYSLINUXDIR = "/"
26# The kernel has an internal default console, which you can override with 25# The kernel has an internal default console, which you can override with
27# a console=...some_tty... 26# a console=...some_tty...
diff --git a/meta/classes/systemd-boot-cfg.bbclass b/meta/classes/systemd-boot-cfg.bbclass
index 107758548c..021c9f9331 100644
--- a/meta/classes/systemd-boot-cfg.bbclass
+++ b/meta/classes/systemd-boot-cfg.bbclass
@@ -1,5 +1,3 @@
1KERNEL_IMAGETYPE ??= "bzImage"
2
3SYSTEMD_BOOT_CFG ?= "${S}/loader.conf" 1SYSTEMD_BOOT_CFG ?= "${S}/loader.conf"
4SYSTEMD_BOOT_ENTRIES ?= "" 2SYSTEMD_BOOT_ENTRIES ?= ""
5SYSTEMD_BOOT_TIMEOUT ?= "10" 3SYSTEMD_BOOT_TIMEOUT ?= "10"
diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc
index 76d09af726..9620ad48de 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"
47 47
48GTK2DISTROFEATURES = "directfb x11" 48GTK2DISTROFEATURES = "directfb x11"
49GTK3DISTROFEATURES = "x11 wayland" 49GTK3DISTROFEATURES = "x11 wayland"
50
51ARCH_DEFAULT_KERNELIMAGETYPE = "zImage"
52ARCH_DEFAULT_KERNELIMAGETYPE_x86 = "bzImage"
53ARCH_DEFAULT_KERNELIMAGETYPE_x86-64 = "bzImage"
54KERNEL_IMAGETYPE ??= "${ARCH_DEFAULT_KERNELIMAGETYPE}"
55KERNEL_IMAGETYPES ??= "${KERNEL_IMAGETYPE}"