4 files changed, 59 insertions, 25 deletions
diff --git a/recipes-platform/images/agl-ivi-demo-base-flutter.bb b/recipes-platform/images/agl-ivi-demo-base-flutter.bb
new file mode 100644
index 000000000..70fd2c51d
--- /dev/null
+++ b/recipes-platform/images/agl-ivi-demo-base-flutter.bb
@@ -0,0 +1,9 @@
+require agl-ivi-demo-base.bb
+
+DESCRIPTION = "AGL Flutter demo base image"
+
+IMAGE_INSTALL += " \
+    packagegroup-agl-demo-platform-flutter \
+    weston-ini-conf-flutter \
+    ${@bb.utils.contains("AGL_FEATURES", "agl-demo-preload", "", "weston-terminal-conf", d)} \
+"
diff --git a/recipes-platform/images/agl-ivi-demo-base.bb b/recipes-platform/images/agl-ivi-demo-base.bb
new file mode 100644
index 000000000..da8d2eece
--- /dev/null
+++ b/recipes-platform/images/agl-ivi-demo-base.bb
@@ -0,0 +1,23 @@
+require agl-image-ivi.bb
+
+DESCRIPTION = "AGL demo base image"
+
+require agl-demo-features.inc
+require agl-demo-container-guest-integration.inc
+
+AGL_DEVEL_INSTALL += "\
+    packagegroup-agl-kuksa-val-databroker-devel \
+    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.bb b/recipes-platform/images/agl-ivi-demo-platform-flutter.bb
index 9d67ee31e..dfebce0d7 100644
--- a/recipes-platform/images/agl-ivi-demo-platform-flutter.bb
+++ b/recipes-platform/images/agl-ivi-demo-platform-flutter.bb
@@ -1,21 +1,21 @@
-require agl-image-ivi.bb
+require agl-ivi-demo-base-flutter.bb
 
-DESCRIPTION = "AGL Flutter based Demo Platform image"
+DESCRIPTION = "AGL Flutter Demo Platform image"
 
-require agl-demo-features.inc
-require agl-demo-container-guest-integration.inc
-
-# Add packages for demo platform (include demo apps) here
-
-AGL_DEVEL_INSTALL += "\
-    packagegroup-agl-kuksa-val-databroker-devel \
-    simple-can-simulator \
+AGL_APPS_INSTALL += " \
+    flutter-homescreen \
+    flutter-dashboard \
+    flutter-hvac \
+    ondemandnavi \
+    settings \
+    mediaplayer \
+    messaging \
+    phone \
+    radio \
 "
 
 IMAGE_INSTALL += " \
-    packagegroup-agl-demo-platform-flutter \
-    weston-ini-conf-flutter \
-    ${@bb.utils.contains("AGL_FEATURES", "agl-demo-preload", "", "weston-terminal-conf", d)} \
-    ${@bb.utils.contains("DISTRO_FEATURES", "agl-devel", "${AGL_DEVEL_INSTALL}" , "", d)} \
+    qtquickcontrols2-agl \
+    qtquickcontrols2-agl-style \
 "
 
diff --git a/recipes-platform/images/agl-ivi-demo-platform.bb b/recipes-platform/images/agl-ivi-demo-platform.bb
index d860cd518..318bae46f 100644
--- a/recipes-platform/images/agl-ivi-demo-platform.bb
+++ b/recipes-platform/images/agl-ivi-demo-platform.bb
@@ -1,20 +1,22 @@
-require agl-image-ivi.bb
+require agl-ivi-demo-base.bb
 
-DESCRIPTION = "AGL Demo Platform image currently contains a simple HMI and demos."
+DESCRIPTION = "AGL Qt Demo Platform image"
 
-require agl-demo-features.inc
-require agl-demo-container-guest-integration.inc
-
-# Add packages for demo platform (include demo apps) here
-
-AGL_DEVEL_INSTALL += "\
-    packagegroup-agl-kuksa-val-databroker-devel \
-    simple-can-simulator \
+AGL_APPS_INSTALL += " \
+    dashboard \
+    hvac \
+    ondemandnavi \
+    settings \
+    mediaplayer \
+    messaging \
+    phone \
+    radio \
+    window-management-client-grpc \
+    camera-gstreamer \
 "
 
 IMAGE_INSTALL += " \
     packagegroup-agl-demo-platform \
     ${@bb.utils.contains("AGL_FEATURES", "agl-demo-preload", "", "weston-terminal-conf", d)} \
-    ${@bb.utils.contains("DISTRO_FEATURES", "agl-devel", "${AGL_DEVEL_INSTALL}" , "", d)} \
 "