From 99f8e91d6641505e85528ca6e85b88a36888f9e6 Mon Sep 17 00:00:00 2001 From: Jan-Simon Moeller Date: Tue, 12 May 2020 17:42:47 +0200 Subject: Support the rewitten rpi4 machine file layout The reworked rpi4 board support will build with MACHINE = raspberrypi4-64 to match upstream. This leads to some paths being different on the download server. Thus we need to adapt the scripts. Signed-off-by: Jan-Simon Moeller Change-Id: Iac1e2bb8c80bb751138969653a5548c6133a665a --- templates/machines/raspberrypi4-64.jinja2 | 1 + templates/machines/raspberrypi4.jinja2 | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 templates/machines/raspberrypi4-64.jinja2 (limited to 'templates/machines') diff --git a/templates/machines/raspberrypi4-64.jinja2 b/templates/machines/raspberrypi4-64.jinja2 new file mode 100644 index 0000000..063ca3b --- /dev/null +++ b/templates/machines/raspberrypi4-64.jinja2 @@ -0,0 +1 @@ +{%- extends 'machines/raspberrypi4.jinja2' %} diff --git a/templates/machines/raspberrypi4.jinja2 b/templates/machines/raspberrypi4.jinja2 index 2a96b43..efa3e11 100644 --- a/templates/machines/raspberrypi4.jinja2 +++ b/templates/machines/raspberrypi4.jinja2 @@ -11,9 +11,9 @@ {%- endif %} {%- set dtb = dtb|default("bcm2711-rpi-4-b.dtb") %} {%- if (build_type == 'daily') or (build_type == 'release') %} - {%- set rfs_image = rfs_image|default("agl-demo-platform-crosssdk-raspberrypi4.ext4.xz") %} + {%- set rfs_image = rfs_image|default("agl-demo-platform-crosssdk-" + yocto_machine + ".ext4.xz") %} {%- else %} - {%- set rfs_image = rfs_image|default("agl-demo-platform-raspberrypi4.ext4.xz") %} + {%- set rfs_image = rfs_image|default("agl-demo-platform-" + yocto_machine + ".ext4.xz") %} {%- endif %} {%- block main %} -- cgit 1.2.3-korg