summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2024-04-26 10:44:44 -0400
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2024-05-23 12:13:21 +0000
commit24e22727b7f0c21eeeb62cd536e0c3b25775735b (patch)
treea006b09e21015ba7052202262b868950565506bd
parentbcc5b2bce4992377120de56cf9886abc10d66f6c (diff)
Rework demo image naming
Rename the demo images to align with the following scheme: agl-<ivi|cluster|etc>-<image|demo>-<qt|flutter|etc>(-<crosssdk|preconfigured>) The intent is to make the naming more consistent in preparation for switching to preconfigured images as a replacement for the existing agl-demo-preload, agl-demo-cluster-support, agl-kvm-host-* aglsetup.sh features. Additionally, the prototype LXC demo image support has been removed as it is unused and would need updating for these and upcoming changes. Bug-AGL: SPEC-5138 Change-Id: I8d907713b09eb47c3cb0ebd5326ab063b2684ea2 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl-demo/+/29864 ci-image-boot-test: Jenkins Job builder account Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
-rw-r--r--conf/conf-notes.txt16
-rw-r--r--dynamic-layers/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-agl-demo-platform/basic.in9
-rw-r--r--dynamic-layers/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-agl-demo-platform/environment.in8
-rw-r--r--dynamic-layers/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-agl-demo-platform/misc.in3
-rw-r--r--dynamic-layers/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-agl-demo-platform/mount.in17
-rw-r--r--dynamic-layers/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-agl-demo-platform/network.in3
-rw-r--r--dynamic-layers/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-agl-demo-platform/system.conf.agl-demo-platform.in9
-rw-r--r--dynamic-layers/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-agl-demo-platform_1.0.bb7
-rw-r--r--dynamic-layers/meta-agl-ic-container/recipes-platform/images/agl-lxc-demo-platform.bb31
-rwxr-xr-xmeta-agl-demo.md4
-rw-r--r--recipes-config/qemu-config/files/agl-cluster-demo-flutter.conf (renamed from recipes-config/qemu-config/files/agl-cluster-demo-platform-flutter.conf)0
-rw-r--r--recipes-config/qemu-config/files/agl-cluster-demo-qt.conf (renamed from recipes-config/qemu-config/files/agl-cluster-demo-platform.conf)0
-rw-r--r--recipes-config/qemu-config/files/agl-ivi-demo-flutter.conf (renamed from recipes-config/qemu-config/files/agl-demo-platform.conf)0
-rw-r--r--recipes-config/qemu-config/files/agl-ivi-demo-qt.conf (renamed from recipes-config/qemu-config/files/agl-ivi-demo-platform-flutter.conf)0
-rw-r--r--recipes-config/qemu-config/qemu-config-agl-cluster-demo-flutter.bb (renamed from recipes-config/qemu-config/qemu-config-agl-cluster-demo-platform-flutter.bb)2
-rw-r--r--recipes-config/qemu-config/qemu-config-agl-cluster-demo-qt.bb (renamed from recipes-config/qemu-config/qemu-config-agl-cluster-demo-platform.bb)2
-rw-r--r--recipes-config/qemu-config/qemu-config-agl-ivi-demo-flutter.bb (renamed from recipes-config/qemu-config/qemu-config-agl-ivi-demo-platform-flutter.bb)2
-rw-r--r--recipes-config/qemu-config/qemu-config-agl-ivi-demo-qt.bb (renamed from recipes-config/qemu-config/qemu-config-agl-demo-platform.bb)2
-rw-r--r--recipes-config/qemu-config/qemu-config-vmnet0.bb3
-rw-r--r--recipes-graphics/wayland/weston-ini-conf_agldemo.inc4
-rw-r--r--recipes-platform/images/agl-cluster-demo-flutter.bb (renamed from recipes-platform/images/agl-cluster-demo-platform-flutter.bb)0
-rw-r--r--recipes-platform/images/agl-cluster-demo-qt.bb (renamed from recipes-platform/images/agl-cluster-demo-platform.bb)0
l---------recipes-platform/images/agl-demo-platform-crosssdk.bb1
l---------recipes-platform/images/agl-demo-platform-html5.bb1
l---------recipes-platform/images/agl-demo-platform.bb1
-rw-r--r--recipes-platform/images/agl-ivi-demo-base.bb19
-rw-r--r--recipes-platform/images/agl-ivi-demo-flutter-simple.bb (renamed from recipes-platform/images/agl-ivi-demo-platform-flutter-simple.bb)4
-rw-r--r--recipes-platform/images/agl-ivi-demo-flutter.bb (renamed from recipes-platform/images/agl-ivi-demo-platform-flutter.bb)4
-rw-r--r--recipes-platform/images/agl-ivi-demo-html5.bb (renamed from recipes-platform/images/agl-ivi-demo-platform-html5.bb)4
-rw-r--r--recipes-platform/images/agl-ivi-demo-qt-crosssdk.bb (renamed from recipes-platform/images/agl-ivi-demo-platform-crosssdk.bb)4
-rw-r--r--recipes-platform/images/agl-ivi-demo-qt.bb (renamed from recipes-platform/images/agl-ivi-demo-platform.bb)4
-rw-r--r--recipes-platform/images/agl-ivi-image-crosssdk.bb (renamed from recipes-platform/images/agl-image-ivi-crosssdk.bb)2
-rw-r--r--recipes-platform/images/agl-ivi-image-flutter.bb (renamed from recipes-platform/images/agl-ivi-demo-base-flutter.bb)4
-rw-r--r--recipes-platform/images/agl-ivi-image.bb (renamed from recipes-platform/images/agl-image-ivi.bb)27
-rw-r--r--recipes-platform/images/agl-kvm-demo.bb (renamed from recipes-platform/images/agl-kvm-demo-platform.bb)7
-rw-r--r--recipes-platform/images/agl-telematics-demo.bb (renamed from recipes-platform/images/agl-telematics-demo-platform.bb)3
36 files changed, 51 insertions, 156 deletions
diff --git a/conf/conf-notes.txt b/conf/conf-notes.txt
index e267e3db1..bf70e9e69 100644
--- a/conf/conf-notes.txt
+++ b/conf/conf-notes.txt
@@ -1,8 +1,10 @@
Common targets are:
- agl-image-ivi
- agl-image-ivi-crosssdk
- agl-image-ivi-qa
- agl-demo-platform
- agl-demo-platform-crosssdk
- agl-demo-platform-qa
- agl-demo-platform-html5
+ agl-ivi-image
+ agl-ivi-image-crosssdk
+ agl-ivi-demo-flutter
+ agl-ivi-demo-html5
+ agl-ivi-demo-qt
+ agl-ivi-demo-qt-crosssdk
+ agl-cluster-demo-flutter
+ agl-cluster-demo-qt
+ agl-ivi-demo-control-panel
diff --git a/dynamic-layers/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-agl-demo-platform/basic.in b/dynamic-layers/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-agl-demo-platform/basic.in
deleted file mode 100644
index 1fd9f3476..000000000
--- a/dynamic-layers/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-agl-demo-platform/basic.in
+++ /dev/null
@@ -1,9 +0,0 @@
-# lxc basic setting
-lxc.rootfs.path = dir:/var/lib/machines/ivi-demo
-lxc.signal.halt = SIGRTMIN+3
-lxc.signal.reboot = SIGTERM
-lxc.uts.name = "ivi"
-lxc.tty.max = 1
-lxc.pty.max = 1
-lxc.cap.drop = sys_module mac_admin mac_override sys_time
-
diff --git a/dynamic-layers/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-agl-demo-platform/environment.in b/dynamic-layers/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-agl-demo-platform/environment.in
deleted file mode 100644
index 632252d58..000000000
--- a/dynamic-layers/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-agl-demo-platform/environment.in
+++ /dev/null
@@ -1,8 +0,0 @@
-# lxc environment variable setting
-lxc.environment = QT_QPA_PLATFORM=wayland
-lxc.environment = QT_QPA_PLATFORM_PLUGIN_PATH=/usr/lib/plugins/
-lxc.environment = QML_IMPORT_PATH=/usr/lib/qml/
-lxc.environment = QML2_IMPORT_PATH=/usr/lib/qml/
-lxc.environment = QT_WAYLAND_SHELL_INTEGRATION=xdg-shell
-lxc.environment = PIPEWIRE_RUNTIME_DIR=/var
-
diff --git a/dynamic-layers/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-agl-demo-platform/misc.in b/dynamic-layers/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-agl-demo-platform/misc.in
deleted file mode 100644
index 9b4f4883e..000000000
--- a/dynamic-layers/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-agl-demo-platform/misc.in
+++ /dev/null
@@ -1,3 +0,0 @@
-# lxc misc setting
-lxc.start.auto = @LXC_AUTO_START@
-
diff --git a/dynamic-layers/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-agl-demo-platform/mount.in b/dynamic-layers/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-agl-demo-platform/mount.in
deleted file mode 100644
index 262f09bdc..000000000
--- a/dynamic-layers/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-agl-demo-platform/mount.in
+++ /dev/null
@@ -1,17 +0,0 @@
-# lxc mount setting
-lxc.mount.entry = /var/lib/lxc/ivi-demo/system.conf etc/systemd/system.conf.d/10-environment.conf none bind,optional,create=file
-
-lxc.mount.auto = cgroup:mixed proc:mixed sys:mixed
-lxc.mount.entry = shm /dev/shm tmpfs defaults 0 0
-lxc.mount.entry = /sys/kernel/security sys/kernel/security none ro,bind,optional 0 0
-lxc.mount.entry = tmpfs run tmpfs defaults
-lxc.mount.entry = /run/udev/data run/udev/data none ro,bind,optional,create=dir
-
-lxc.cgroup.devices.allow = c 226:* rwm
-lxc.mount.entry = /dev/dri dev/dri none bind,optional,create=dir
-
-lxc.mount.entry = /run/drm-lease-manager/lease-ivi var/display/drm-lease-manager/lease none bind,create=file
-
-lxc.cgroup.devices.allow = c 13:* rwm
-lxc.mount.entry = /dev/input dev/input none bind,optional,create=dir
-lxc.mount.entry = /run/pipewire/pipewire-0 var/pipewire-0 none bind,optional,create=file
diff --git a/dynamic-layers/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-agl-demo-platform/network.in b/dynamic-layers/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-agl-demo-platform/network.in
deleted file mode 100644
index 573f4796d..000000000
--- a/dynamic-layers/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-agl-demo-platform/network.in
+++ /dev/null
@@ -1,3 +0,0 @@
-# lxc network setting
-lxc.net.0.type = empty
-
diff --git a/dynamic-layers/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-agl-demo-platform/system.conf.agl-demo-platform.in b/dynamic-layers/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-agl-demo-platform/system.conf.agl-demo-platform.in
deleted file mode 100644
index de7c6cdd1..000000000
--- a/dynamic-layers/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-agl-demo-platform/system.conf.agl-demo-platform.in
+++ /dev/null
@@ -1,9 +0,0 @@
-[Manager]
-DefaultEnvironment = DLM_RUNTIME_PATH=/var/display/drm-lease-manager
-DefaultEnvironment = DRM_LEASE_DEVICE=@DRM_LEASE_DEVICE@
-DefaultEnvironment = QT_QPA_PLATFORM=wayland
-DefaultEnvironment = QT_QPA_PLATFORM_PLUGIN_PATH=/usr/lib/plugins/
-DefaultEnvironment = QML_IMPORT_PATH=/usr/lib/qml/
-DefaultEnvironment = QML2_IMPORT_PATH=/usr/lib/qml/
-DefaultEnvironment = QT_WAYLAND_SHELL_INTEGRATION=xdg-shell
-DefaultEnvironment = PIPEWIRE_RUNTIME_DIR=/var
diff --git a/dynamic-layers/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-agl-demo-platform_1.0.bb b/dynamic-layers/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-agl-demo-platform_1.0.bb
deleted file mode 100644
index 049c8ab83..000000000
--- a/dynamic-layers/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-agl-demo-platform_1.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-DESCRIPTION = "AGL IVI demo container LXC config"
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9"
-
-inherit lxc-config
-
-LXC_AUTO_START ??= "0"
diff --git a/dynamic-layers/meta-agl-ic-container/recipes-platform/images/agl-lxc-demo-platform.bb b/dynamic-layers/meta-agl-ic-container/recipes-platform/images/agl-lxc-demo-platform.bb
deleted file mode 100644
index b8402294d..000000000
--- a/dynamic-layers/meta-agl-ic-container/recipes-platform/images/agl-lxc-demo-platform.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-SUMMARY = "LXC host demo image"
-LICENSE = "MIT"
-
-require recipes-platform/images/lxc-host-image-minimal.bb
-
-CONTAINER_IMAGES ?= "agl-container-cluster:guest-image-cluster-demo \
- agl-container-ivi:agl-demo-platform \
- "
-
-IMAGE_INSTALL += " \
- kernel-modules \
- alsa-utils \
- packagegroup-pipewire \
- pipewire-ic-ipc \
- wireplumber-config-agl \
-"
-
-# packages required for network bridge settings via lxc-net
-IMAGE_INSTALL += " \
- lxc-networking \
- iptables-modules \
- dnsmasq \
- systemd-netif-config \
- kernel-module-xt-addrtype \
- kernel-module-xt-multiport \
-"
-
-# network manager to use
-VIRTUAL-RUNTIME_net_manager = "systemd"
-
-IMAGE_INSTALL:append:rcar-gen3 = " kernel-module-gles "
diff --git a/meta-agl-demo.md b/meta-agl-demo.md
index 521ebad8e..69233c780 100755
--- a/meta-agl-demo.md
+++ b/meta-agl-demo.md
@@ -2,9 +2,7 @@
The `meta-agl-demo` layer is the reference user interface layer for the DEMO
platform of Automotive Grade Linux (AGL).
-The layer provides a reference platform and applications.
-The BitBake target name for the DEMO platform is `agl-demo-platform`, which is
-the full DEMO platform image.
+The layer provides a demo applications and images.
## Layer Dependencies
diff --git a/recipes-config/qemu-config/files/agl-cluster-demo-platform-flutter.conf b/recipes-config/qemu-config/files/agl-cluster-demo-flutter.conf
index 99d1f10c9..99d1f10c9 100644
--- a/recipes-config/qemu-config/files/agl-cluster-demo-platform-flutter.conf
+++ b/recipes-config/qemu-config/files/agl-cluster-demo-flutter.conf
diff --git a/recipes-config/qemu-config/files/agl-cluster-demo-platform.conf b/recipes-config/qemu-config/files/agl-cluster-demo-qt.conf
index 1ecefc477..1ecefc477 100644
--- a/recipes-config/qemu-config/files/agl-cluster-demo-platform.conf
+++ b/recipes-config/qemu-config/files/agl-cluster-demo-qt.conf
diff --git a/recipes-config/qemu-config/files/agl-demo-platform.conf b/recipes-config/qemu-config/files/agl-ivi-demo-flutter.conf
index 7ff32bc18..7ff32bc18 100644
--- a/recipes-config/qemu-config/files/agl-demo-platform.conf
+++ b/recipes-config/qemu-config/files/agl-ivi-demo-flutter.conf
diff --git a/recipes-config/qemu-config/files/agl-ivi-demo-platform-flutter.conf b/recipes-config/qemu-config/files/agl-ivi-demo-qt.conf
index 7ff32bc18..7ff32bc18 100644
--- a/recipes-config/qemu-config/files/agl-ivi-demo-platform-flutter.conf
+++ b/recipes-config/qemu-config/files/agl-ivi-demo-qt.conf
diff --git a/recipes-config/qemu-config/qemu-config-agl-cluster-demo-platform-flutter.bb b/recipes-config/qemu-config/qemu-config-agl-cluster-demo-flutter.bb
index 159d3939e..f0bc93fd3 100644
--- a/recipes-config/qemu-config/qemu-config-agl-cluster-demo-platform-flutter.bb
+++ b/recipes-config/qemu-config/qemu-config-agl-cluster-demo-flutter.bb
@@ -9,7 +9,7 @@ SRC_URI = "file://${QEMU_IMAGE}.conf"
do_configure[noexec] = "1"
do_compile[noexec] = "1"
-QEMU_IMAGE = "agl-cluster-demo-platform-flutter"
+QEMU_IMAGE = "agl-cluster-demo-flutter"
QEMU_UNIT = "agl-qemu-runner@${QEMU_IMAGE}.service"
do_install() {
diff --git a/recipes-config/qemu-config/qemu-config-agl-cluster-demo-platform.bb b/recipes-config/qemu-config/qemu-config-agl-cluster-demo-qt.bb
index 8e2aeb3e5..e22e40271 100644
--- a/recipes-config/qemu-config/qemu-config-agl-cluster-demo-platform.bb
+++ b/recipes-config/qemu-config/qemu-config-agl-cluster-demo-qt.bb
@@ -9,7 +9,7 @@ SRC_URI = "file://${QEMU_IMAGE}.conf"
do_configure[noexec] = "1"
do_compile[noexec] = "1"
-QEMU_IMAGE = "agl-cluster-demo-platform"
+QEMU_IMAGE = "agl-cluster-demo-qt"
QEMU_UNIT = "agl-qemu-runner@${QEMU_IMAGE}.service"
do_install() {
diff --git a/recipes-config/qemu-config/qemu-config-agl-ivi-demo-platform-flutter.bb b/recipes-config/qemu-config/qemu-config-agl-ivi-demo-flutter.bb
index 10c30445e..a9f2be43a 100644
--- a/recipes-config/qemu-config/qemu-config-agl-ivi-demo-platform-flutter.bb
+++ b/recipes-config/qemu-config/qemu-config-agl-ivi-demo-flutter.bb
@@ -9,7 +9,7 @@ SRC_URI = "file://${QEMU_IMAGE}.conf"
do_configure[noexec] = "1"
do_compile[noexec] = "1"
-QEMU_IMAGE = "agl-ivi-demo-platform-flutter"
+QEMU_IMAGE = "agl-ivi-demo-flutter"
QEMU_UNIT = "agl-qemu-runner@${QEMU_IMAGE}.service"
do_install() {
diff --git a/recipes-config/qemu-config/qemu-config-agl-demo-platform.bb b/recipes-config/qemu-config/qemu-config-agl-ivi-demo-qt.bb
index da85b7a72..46e043c05 100644
--- a/recipes-config/qemu-config/qemu-config-agl-demo-platform.bb
+++ b/recipes-config/qemu-config/qemu-config-agl-ivi-demo-qt.bb
@@ -9,7 +9,7 @@ SRC_URI = "file://${QEMU_IMAGE}.conf"
do_configure[noexec] = "1"
do_compile[noexec] = "1"
-QEMU_IMAGE = "agl-demo-platform"
+QEMU_IMAGE = "agl-ivi-demo-qt"
QEMU_UNIT = "agl-qemu-runner@${QEMU_IMAGE}.service"
do_install() {
diff --git a/recipes-config/qemu-config/qemu-config-vmnet0.bb b/recipes-config/qemu-config/qemu-config-vmnet0.bb
index bc634bf32..a5a12982e 100644
--- a/recipes-config/qemu-config/qemu-config-vmnet0.bb
+++ b/recipes-config/qemu-config/qemu-config-vmnet0.bb
@@ -14,9 +14,6 @@ SRC_URI = "file://vmnet0.netdev \
do_configure[noexec] = "1"
do_compile[noexec] = "1"
-QEMU_IMAGE = "agl-cluster-demo-platform"
-QEMU_UNIT = "agl-qemu-runner@${QEMU_IMAGE}.service"
-
do_install() {
# Install systemd-networkd vmnet0 configuration
install -d ${D}${systemd_unitdir}/network
diff --git a/recipes-graphics/wayland/weston-ini-conf_agldemo.inc b/recipes-graphics/wayland/weston-ini-conf_agldemo.inc
index 6d6a0a8dd..5c7b9feeb 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-ivi-demo-platform-flutter"
-GUEST_VM2_IMAGE ?= "agl-cluster-demo-platform-flutter"
+GUEST_VM1_IMAGE ?= "agl-ivi-demo-flutter"
+GUEST_VM2_IMAGE ?= "agl-cluster-demo-flutter"
do_compile:append() {
# Start with a canned configuration for a KVM host, filling in
diff --git a/recipes-platform/images/agl-cluster-demo-platform-flutter.bb b/recipes-platform/images/agl-cluster-demo-flutter.bb
index 5cf3daf9f..5cf3daf9f 100644
--- a/recipes-platform/images/agl-cluster-demo-platform-flutter.bb
+++ b/recipes-platform/images/agl-cluster-demo-flutter.bb
diff --git a/recipes-platform/images/agl-cluster-demo-platform.bb b/recipes-platform/images/agl-cluster-demo-qt.bb
index c427af66b..c427af66b 100644
--- a/recipes-platform/images/agl-cluster-demo-platform.bb
+++ b/recipes-platform/images/agl-cluster-demo-qt.bb
diff --git a/recipes-platform/images/agl-demo-platform-crosssdk.bb b/recipes-platform/images/agl-demo-platform-crosssdk.bb
deleted file mode 120000
index 70daba005..000000000
--- a/recipes-platform/images/agl-demo-platform-crosssdk.bb
+++ /dev/null
@@ -1 +0,0 @@
-agl-ivi-demo-platform-crosssdk.bb \ No newline at end of file
diff --git a/recipes-platform/images/agl-demo-platform-html5.bb b/recipes-platform/images/agl-demo-platform-html5.bb
deleted file mode 120000
index fabf5e35f..000000000
--- a/recipes-platform/images/agl-demo-platform-html5.bb
+++ /dev/null
@@ -1 +0,0 @@
-agl-ivi-demo-platform-html5.bb \ No newline at end of file
diff --git a/recipes-platform/images/agl-demo-platform.bb b/recipes-platform/images/agl-demo-platform.bb
deleted file mode 120000
index ff29cf3e8..000000000
--- a/recipes-platform/images/agl-demo-platform.bb
+++ /dev/null
@@ -1 +0,0 @@
-agl-ivi-demo-platform.bb \ No newline at end of file
diff --git a/recipes-platform/images/agl-ivi-demo-base.bb b/recipes-platform/images/agl-ivi-demo-base.bb
deleted file mode 100644
index da4d26840..000000000
--- a/recipes-platform/images/agl-ivi-demo-base.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-require agl-image-ivi.bb
-
-DESCRIPTION = "AGL demo base image"
-
-require agl-ivi-demo-features.inc
-require agl-demo-container-guest-integration.inc
-
-AGL_DEVEL_INSTALL += "\
- simple-can-simulator \
- unzip \
- mpc \
-"
-
-AGL_APPS_INSTALL = ""
-
-IMAGE_INSTALL += " \
- ${AGL_APPS_INSTALL} \
- ${@bb.utils.contains("DISTRO_FEATURES", "agl-devel", "${AGL_DEVEL_INSTALL}" , "", d)} \
-"
diff --git a/recipes-platform/images/agl-ivi-demo-platform-flutter-simple.bb b/recipes-platform/images/agl-ivi-demo-flutter-simple.bb
index f1932df5b..2e33f47b1 100644
--- a/recipes-platform/images/agl-ivi-demo-platform-flutter-simple.bb
+++ b/recipes-platform/images/agl-ivi-demo-flutter-simple.bb
@@ -1,6 +1,6 @@
-require agl-ivi-demo-base-flutter.bb
+require agl-ivi-image-flutter.bb
-DESCRIPTION = "AGL Flutter Demo Platform image"
+SUMMARY = "AGL IVI demo simple Flutter image"
AGL_APPS_INSTALL += " \
flutter-homescreen \
diff --git a/recipes-platform/images/agl-ivi-demo-platform-flutter.bb b/recipes-platform/images/agl-ivi-demo-flutter.bb
index 81a1c8046..75fd57c60 100644
--- a/recipes-platform/images/agl-ivi-demo-platform-flutter.bb
+++ b/recipes-platform/images/agl-ivi-demo-flutter.bb
@@ -1,6 +1,6 @@
-require agl-ivi-demo-base-flutter.bb
+require agl-ivi-image-flutter.bb
-DESCRIPTION = "AGL Flutter Demo Platform image"
+SUMMARY = "AGL IVI demo Flutter image"
AGL_APPS_INSTALL += " \
flutter-ics-homescreen \
diff --git a/recipes-platform/images/agl-ivi-demo-platform-html5.bb b/recipes-platform/images/agl-ivi-demo-html5.bb
index 520b443e9..34de64bd7 100644
--- a/recipes-platform/images/agl-ivi-demo-platform-html5.bb
+++ b/recipes-platform/images/agl-ivi-demo-html5.bb
@@ -1,6 +1,6 @@
-require agl-image-ivi.bb
+require agl-ivi-image.bb
-SUMMARY = "DEMO platform of AGL HTML5 profile"
+SUMMARY = "AGL IVI demo HTML5 image"
DESCRIPTION = "Contains the web runtime and sample web apps"
require agl-demo-container-guest-integration.inc
diff --git a/recipes-platform/images/agl-ivi-demo-platform-crosssdk.bb b/recipes-platform/images/agl-ivi-demo-qt-crosssdk.bb
index c9ed07a0a..d5a98b36d 100644
--- a/recipes-platform/images/agl-ivi-demo-platform-crosssdk.bb
+++ b/recipes-platform/images/agl-ivi-demo-qt-crosssdk.bb
@@ -1,6 +1,6 @@
-require agl-ivi-demo-platform.bb
+require agl-ivi-demo-qt.bb
-SUMMARY = "Cross SDK of demo AGL Distribution for IVI profile"
+SUMMARY = "Cross SDK of AGL IVI demo"
DESCRIPTION = "SDK image for full AGL Distribution for IVI profile. \
It includes the full toolchain, plus development headers and libraries \
diff --git a/recipes-platform/images/agl-ivi-demo-platform.bb b/recipes-platform/images/agl-ivi-demo-qt.bb
index 2854462cf..2f0e94276 100644
--- a/recipes-platform/images/agl-ivi-demo-platform.bb
+++ b/recipes-platform/images/agl-ivi-demo-qt.bb
@@ -1,6 +1,6 @@
-require agl-ivi-demo-base.bb
+require agl-ivi-image.bb
-DESCRIPTION = "AGL Qt Demo Platform image"
+SUMMARY = "AGL IVI demo Qt image"
AGL_APPS_INSTALL += " \
dashboard \
diff --git a/recipes-platform/images/agl-image-ivi-crosssdk.bb b/recipes-platform/images/agl-ivi-image-crosssdk.bb
index be008832b..74b006026 100644
--- a/recipes-platform/images/agl-image-ivi-crosssdk.bb
+++ b/recipes-platform/images/agl-ivi-image-crosssdk.bb
@@ -1,4 +1,4 @@
-require agl-image-ivi.bb
+require agl-ivi-image.bb
SUMMARY = "Cross SDK of minimal AGL Distribution for IVI profile"
diff --git a/recipes-platform/images/agl-ivi-demo-base-flutter.bb b/recipes-platform/images/agl-ivi-image-flutter.bb
index ce2ea6bb2..56a8b2f85 100644
--- a/recipes-platform/images/agl-ivi-demo-base-flutter.bb
+++ b/recipes-platform/images/agl-ivi-image-flutter.bb
@@ -1,6 +1,6 @@
-require agl-ivi-demo-base.bb
+require agl-ivi-image.bb
-DESCRIPTION = "AGL Flutter demo base image"
+SUMMARY = "AGL IVI demo base Flutter image"
IMAGE_INSTALL += " \
packagegroup-agl-demo-platform-flutter \
diff --git a/recipes-platform/images/agl-image-ivi.bb b/recipes-platform/images/agl-ivi-image.bb
index 69d0ed991..12122cafb 100644
--- a/recipes-platform/images/agl-image-ivi.bb
+++ b/recipes-platform/images/agl-ivi-image.bb
@@ -1,11 +1,21 @@
-SUMMARY = "A basic system of AGL distribution of IVI profile"
-
-DESCRIPTION = "Basic image for baseline of AGL Distribution for IVI profile."
-
+SUMMARY = "AGL IVI demo base image"
LICENSE = "MIT"
require recipes-platform/images/agl-image-compositor.bb
+require agl-ivi-demo-features.inc
+require agl-demo-container-guest-integration.inc
+
+IMAGE_FEATURES += "splash package-management ssh-server-openssh"
+
+AGL_DEVEL_INSTALL += "\
+ simple-can-simulator \
+ unzip \
+ mpc \
+"
+
+AGL_APPS_INSTALL = ""
+
IMAGE_INSTALL += " \
packagegroup-agl-ivi-connectivity \
packagegroup-agl-ivi-graphics \
@@ -14,10 +24,9 @@ IMAGE_INSTALL += " \
packagegroup-agl-ivi-navigation \
packagegroup-agl-ivi-identity \
packagegroup-agl-ivi-services-applaunchd \
- ${@bb.utils.contains("AGL_FEATURES", "agl-kvm-host-audio", "", "packagegroup-agl-ivi-services-platform", d)} \
iproute2 \
- "
-
-IMAGE_FEATURES += "splash package-management ssh-server-openssh"
-
+ ${AGL_APPS_INSTALL} \
+ ${@bb.utils.contains("DISTRO_FEATURES", "agl-devel", "${AGL_DEVEL_INSTALL}" , "", d)} \
+ ${@bb.utils.contains("AGL_FEATURES", "agl-kvm-host-audio", "", "packagegroup-agl-ivi-services-platform", d)} \
+"
diff --git a/recipes-platform/images/agl-kvm-demo-platform.bb b/recipes-platform/images/agl-kvm-demo.bb
index ddb2ddb45..c27757005 100644
--- a/recipes-platform/images/agl-kvm-demo-platform.bb
+++ b/recipes-platform/images/agl-kvm-demo.bb
@@ -1,5 +1,4 @@
-DESCRIPTION = "AGL KVM+QEMU Demo Platform image."
-
+SUMMARY = "AGL KVM+QEMU Demo Platform image."
LICENSE = "MIT"
require recipes-platform/images/agl-image-compositor.bb
@@ -59,8 +58,8 @@ IMAGE_INSTALL += "\
GUEST_MACHINE ?= "virtio-${TUNE_ARCH}"
-GUEST_VM1_IMAGE ?= "agl-ivi-demo-platform-flutter"
-GUEST_VM2_IMAGE ?= "agl-cluster-demo-platform-flutter"
+GUEST_VM1_IMAGE ?= "agl-ivi-demo-flutter"
+GUEST_VM2_IMAGE ?= "agl-cluster-demo-flutter"
GUEST_IMAGES ?= "agl-kvm-guest:${GUEST_VM1_IMAGE} agl-kvm-guest:${GUEST_VM2_IMAGE}"
diff --git a/recipes-platform/images/agl-telematics-demo-platform.bb b/recipes-platform/images/agl-telematics-demo.bb
index 7a113b65b..987bd3878 100644
--- a/recipes-platform/images/agl-telematics-demo-platform.bb
+++ b/recipes-platform/images/agl-telematics-demo.bb
@@ -1,5 +1,4 @@
-DESCRIPTION = "AGL Telematics Demo Platform image."
-
+SUMMARY = "AGL Telematics Demo Platform image."
LICENSE = "MIT"
require recipes-platform/images/agl-image-minimal.bb