meta-agl-ic-container: handle scarthgap IMAGE_NAME_SUFFIX change

Use the IMAGE_NAME_SUFFIX variable in the container image copying
logic to handle its addition into the image filenames by upstream.

Bug-AGL: SPEC-5123

Change-Id: I65fb062dc02ea44847787e5a7e6deaf524d9ff42
Signed-off-by: Scott Murray <scott.murray@konsulko.com>

diff --git a/meta-agl-ic-container/recipes-platform/images/agl-lxc-install-single-image.inc b/meta-agl-ic-container/recipes-platform/images/agl-lxc-install-single-image.inc
index 49b7bc8..4f23029 100644 (file)
--- a/meta-agl-ic-container/recipes-platform/images/agl-lxc-install-single-image.inc
+++ b/meta-agl-ic-container/recipes-platform/images/agl-lxc-install-single-image.inc
@@ -12,7 +12,7 @@ install_container_images() {
         name=${image#guest-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/${MACHINE}/${image}-${MACHINE}${MACHINE_SUFFIX}.tar.bz2"
+        src="${TOPDIR}/tmp-${config}/deploy/images/${MACHINE}/${image}-${MACHINE}${MACHINE_SUFFIX}${IMAGE_NAME_SUFFIX}.tar.bz2"
         bbnote "Installing ${src}"
         tar -C ${IMAGE_ROOTFS}/var/lib/machines/${name} -xf ${src}
     done