Adjust image based on RR release policy

Change image name to new naming.
Remove dropped image from multi container integration.

Bug-AGL: SPEC-5158

Change-Id: I5fad2dbac1f0302f170f08d4a6d538db43fd1e4c
Signed-off-by: Naoto Yamaguchi <naoto.yamaguchi@aisin.co.jp>

1 files changed, 3 insertions, 5 deletions

diff --git a/meta-agl-ic-container/recipes-platform/images/agl-lxc-multi-partition-image.inc b/meta-agl-ic-container/recipes-platform/images/agl-lxc-multi-partition-image.inc
index 0ffadeaf..8842d070 100644
--- a/meta-agl-ic-container/recipes-platform/images/agl-lxc-multi-partition-image.inc
+++ b/meta-agl-ic-container/recipes-platform/images/agl-lxc-multi-partition-image.inc
@@ -6,15 +6,13 @@ require recipes-platform/images/agl-lxc-multiconfig-build.inc
 OUT_OF_TREE_CONTAINER_IMAGE_DEPLOY_DIR ??= ""
 
 OUT_OF_TREE_CONTAINER_IMAGES ??= " \
-    agl-ivi-demo-platform \
-    agl-ivi-demo-platform-flutter \
-    agl-ivi-demo-platform-html5 \
+    agl-ivi-demo-qt \
+    agl-ivi-demo-flutter \
 "
 
 OUT_OF_TREE_CONTAINER_CONFIGS ??= " \
     cm-config-agl-qt-ivi-demo \
     cm-config-agl-flutter-ivi-demo \
-    cm-config-agl-html5-ivi-demo \
 "
 
 CONTAINER_EXCHANGE_DEMO_UI ??= "momiweb momikey"
@@ -42,7 +40,7 @@ install_container_images() {
         er=0
         for image in ${OUT_OF_TREE_CONTAINER_IMAGES}; do
             rm -f "${DEPLOY_DIR_IMAGE}/${image}.ext4"
-            src="${OUT_OF_TREE_CONTAINER_IMAGE_DEPLOY_DIR}/images/${MACHINE}/${image}-${MACHINE}${MACHINE_SUFFIX}.ext4"
+            src="${OUT_OF_TREE_CONTAINER_IMAGE_DEPLOY_DIR}/images/${MACHINE}/${image}-${MACHINE}${MACHINE_SUFFIX}${IMAGE_NAME_SUFFIX}.ext4"
             if [ ! -e ${src} ]; then
                 bberror "File not found at ${src}."
                 er=1