summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCorentin LABBE <clabbe@baylibre.com>2021-05-03 08:15:20 +0000
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2021-05-05 15:05:19 +0000
commit532522694f2dd5beac50cf68824a28f02d72eeae (patch)
tree3e827a7951bf18a1614542179031666db96d4edc
parent0d8e3f4bb8cefb9c2bf2fa470a4f1f731bbd24c6 (diff)
SPEC-3764: use a more recent qemu version for qemuarm
Using a more recent qemu seems to fix problem with screenshot. The easiest way is to use docker to "host" a more recent debian with recent qemu. Change-Id: I7a72de4c6a4dceed7ec967713d7fee3d3523e120 Bug-AGL: SPEC-3764 Signed-off-by: Corentin LABBE <clabbe@baylibre.com>
-rw-r--r--templates/boot/generic-base-boot.jinja25
-rw-r--r--templates/machines/qemuarm.jinja22
2 files changed, 7 insertions, 0 deletions
diff --git a/templates/boot/generic-base-boot.jinja2 b/templates/boot/generic-base-boot.jinja2
index a8e253a..cfd113f 100644
--- a/templates/boot/generic-base-boot.jinja2
+++ b/templates/boot/generic-base-boot.jinja2
@@ -14,5 +14,10 @@
timeout:
minutes: {{ boot_timeout }}
method: {{ boot_method|default("u-boot") }}
+{%- if qemu_docker %}
+ docker:
+ image: kernelci/qemu
+ binary: {{ qemu_binary }}
+{%- endif %}
{%- include 'boot/agl-prompt.jinja' %}
{%- endblock %}
diff --git a/templates/machines/qemuarm.jinja2 b/templates/machines/qemuarm.jinja2
index e219265..4a5f946 100644
--- a/templates/machines/qemuarm.jinja2
+++ b/templates/machines/qemuarm.jinja2
@@ -19,3 +19,5 @@
{%- else %}
{%- set rfs_image = rfs_image|default("agl-demo-platform-qemuarm.ext4.xz") %}
{%- endif %}
+{% set qemu_binary = 'qemu-system-arm' %}
+{% set qemu_docker = True %}