From 364641197bfe95512555abc36b7b62ac48166aaf Mon Sep 17 00:00:00 2001 From: Loys Ollivier Date: Fri, 6 Oct 2017 11:10:54 +0200 Subject: Move boot type to kernel type Boot type is deprecated in lava v2. Replaced by kernel_type and define it from the kernel image name. Change-Id: I6bcb326b5fb8b0230a9d519485741209bfab8ef2 Signed-off-by: Loys Ollivier --- templates/base/agl-base-defaults.jinja2 | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'templates/base') diff --git a/templates/base/agl-base-defaults.jinja2 b/templates/base/agl-base-defaults.jinja2 index f426211..462fb86 100644 --- a/templates/base/agl-base-defaults.jinja2 +++ b/templates/base/agl-base-defaults.jinja2 @@ -19,6 +19,16 @@ {%- set vcs_branch = vcs_branch|default("agl-branch") %} {%- set vcs_url = vcs_url|default(baseurl()) %} +{# Kernel type definition #} +{%- if kernel_image|first|lower == "i" %} + {%- set kernel_type = "image" %} +{%- elif kernel_image|first|lower == "z" %} + {%- set kernel_type = "zimage" %} +{%- else %} + {%- set kernel_type = "uimage" %} +{%- endif %} + +{# Image names definitions #} {%- if rootfs_type == 'nbd' %} {%- set initrd = initrd|default("initramfs-netboot-image-" + yocto_machine +".ext4.gz") %} {%- set boot_commands = "nbd" %} -- cgit 1.2.3-korg