X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=recipes-platform%2Fimages%2Fagl-ivi-image.bb;fp=recipes-platform%2Fimages%2Fagl-image-ivi.bb;h=12122cafbf7ec556a816a9b69ede6c3596ae152c;hb=24e22727b7f0c21eeeb62cd536e0c3b25775735b;hp=69d0ed991e3e4a8e753ba0f7fe0ac5ebddd88977;hpb=bcc5b2bce4992377120de56cf9886abc10d66f6c;p=AGL%2Fmeta-agl-demo.git

diff --git a/recipes-platform/images/agl-image-ivi.bb b/recipes-platform/images/agl-ivi-image.bb
similarity index 63%
rename from recipes-platform/images/agl-image-ivi.bb
rename to 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)} \
+"