X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=recipes-platform%2Fimages%2Fagl-kvm-demo-platform.bb;h=4337ec0256e7ccea09048c8fa265fc9a710a1da0;hb=8f24ebb0b6bd4a7181e188a8ab5aec209a1917e4;hp=e2f5fd2997d9ce27565b67bba3def31a56a5ea4c;hpb=1512bba4f2839e9b4b4748a6b29d35b29d5d65b5;p=AGL%2Fmeta-agl-demo.git

diff --git a/recipes-platform/images/agl-kvm-demo-platform.bb b/recipes-platform/images/agl-kvm-demo-platform.bb
index e2f5fd299..4337ec025 100644
--- a/recipes-platform/images/agl-kvm-demo-platform.bb
+++ b/recipes-platform/images/agl-kvm-demo-platform.bb
@@ -2,13 +2,12 @@ DESCRIPTION = "AGL KVM+QEMU Demo Platform image."
 
 LICENSE = "MIT"
 
-require recipes-platform/images/agl-image-weston.inc
+require recipes-platform/images/agl-image-compositor.bb
 
 IMAGE_FEATURES += "splash package-management ssh-server-openssh"
 
 # Add packages for KVM+QEMU demo platform here
-IMAGE_INSTALL:append = " \
-    packagegroup-agl-image-minimal \
+IMAGE_INSTALL += " \
     packagegroup-agl-core-connectivity \
     kernel-image \
     agl-compositor \
@@ -19,6 +18,7 @@ IMAGE_INSTALL:append = " \
     ${QEMU_GUEST_CONFIGS} \
     util-linux-taskset \
     screen \
+    simple-can-simulator \
     alsa-utils \
 "
 
@@ -28,16 +28,13 @@ 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}"
 
 QEMU_GUEST_CONFIGS ?= ""
 
-# Handle modification of IMAGE_LINK_NAME done by ULCB builds with Kingfisher support
-MACHINE_SUFFIX = "${@bb.utils.contains('AGL_FEATURES', 'kingfisher', '-kf', '', d)}"
-
 python __anonymous() {
     for c in (d.getVar('GUEST_IMAGES') or "").split():
         (mc, image) = c.split(':')
@@ -55,7 +52,7 @@ install_guest_images() {
         name=${image}
         rm -rf  ${IMAGE_ROOTFS}/var/lib/machines/${name}
         install -m 0755 -d ${IMAGE_ROOTFS}/var/lib/machines/${name}
-        src="${TOPDIR}/tmp-${config}/deploy/images/${GUEST_MACHINE}/${image}-${GUEST_MACHINE}${MACHINE_SUFFIX}.ext4"
+        src="${TOPDIR}/tmp-${config}/deploy/images/${GUEST_MACHINE}/${image}-${GUEST_MACHINE}.ext4"
         bbnote "Installing ${src}"
         install -m 0600 ${src} ${IMAGE_ROOTFS}/var/lib/machines/${name}/
 	# Placeholder until booting from kernel in VM image is worked out