From 348df0b19d782ce4cbebc20cd17fc0b6c9d46293 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Tue, 17 Jan 2023 12:35:21 -0500 Subject: [PATCH] agl-kvm-demo-platform: update guests Switch default guest images to Flutter based demo platform images. As well, the simple-can-simulator is added to the host to allow testing or demos. Bug-AGL: SPEC-4618 Change-Id: I2c57ca0ade168c2c3dfae8718e891f9af40e4d88 Signed-off-by: Scott Murray (cherry picked from commit 8b0fed47d196a938b44784d1fc8eaa25c36f84ca) --- recipes-graphics/wayland/weston-ini-conf_agldemo.inc | 4 ++-- recipes-platform/images/agl-kvm-demo-platform.bb | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/recipes-graphics/wayland/weston-ini-conf_agldemo.inc b/recipes-graphics/wayland/weston-ini-conf_agldemo.inc index 21d801455..003d411ce 100644 --- a/recipes-graphics/wayland/weston-ini-conf_agldemo.inc +++ b/recipes-graphics/wayland/weston-ini-conf_agldemo.inc @@ -2,8 +2,8 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/weston-ini-conf:" SRC_URI += "file://weston.ini.kvm.in" -GUEST_VM1_IMAGE ?= "agl-demo-platform" -GUEST_VM2_IMAGE ?= "agl-cluster-demo-platform" +GUEST_VM1_IMAGE ?= "agl-ivi-demo-platform-flutter" +GUEST_VM2_IMAGE ?= "agl-cluster-demo-platform-flutter" do_compile:append() { # Put all of our cfg files together for a default portrait diff --git a/recipes-platform/images/agl-kvm-demo-platform.bb b/recipes-platform/images/agl-kvm-demo-platform.bb index e2f5fd299..d04186b2b 100644 --- a/recipes-platform/images/agl-kvm-demo-platform.bb +++ b/recipes-platform/images/agl-kvm-demo-platform.bb @@ -19,6 +19,7 @@ IMAGE_INSTALL:append = " \ ${QEMU_GUEST_CONFIGS} \ util-linux-taskset \ screen \ + simple-can-simulator \ alsa-utils \ " @@ -28,8 +29,8 @@ IMAGE_INSTALL:append = " \ GUEST_MACHINE ?= "virtio-${TUNE_ARCH}" -GUEST_VM1_IMAGE ?= "agl-demo-platform" -GUEST_VM2_IMAGE ?= "agl-cluster-demo-platform" +GUEST_VM1_IMAGE ?= "agl-ivi-demo-platform-flutter" +GUEST_VM2_IMAGE ?= "agl-cluster-demo-platform-flutter" GUEST_IMAGES ?= "agl-kvm-guest:${GUEST_VM1_IMAGE} agl-kvm-guest:${GUEST_VM2_IMAGE}" -- 2.16.6