X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-agl-lxc%2Frecipes-platform%2Fimages%2Flxc-host-image-minimal.bb;h=11eb513b535ea23efe38cccf33bacf788bfadaf3;hb=refs%2Fchanges%2F45%2F26545%2F2;hp=f702da18461af58872d9956fea8c750ad38f362e;hpb=72ac5f60cf0ee94150471b17c35f4ea46c0dcffb;p=AGL%2Fmeta-agl-devel.git

diff --git a/meta-agl-lxc/recipes-platform/images/lxc-host-image-minimal.bb b/meta-agl-lxc/recipes-platform/images/lxc-host-image-minimal.bb
index f702da18..11eb513b 100644
--- a/meta-agl-lxc/recipes-platform/images/lxc-host-image-minimal.bb
+++ b/meta-agl-lxc/recipes-platform/images/lxc-host-image-minimal.bb
@@ -15,6 +15,9 @@ IMAGE_LINGUAS = " "
 
 NO_RECOMMENDATIONS = "1"
 
+# Handle modification of IMAGE_LINK_NAME done by ULCB builds with Kingfisher support
+MACHINE_SUFFIX = "${@bb.utils.contains('AGL_FEATURES', 'kingfisher', '-kf', '', d)}"
+
 python __anonymous() {
     for c in (d.getVar('CONTAINER_IMAGES') or "").split():
         (mc, image) = c.split(':')
@@ -35,7 +38,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}.tar.bz2"
+        src="${TOPDIR}/tmp-${config}/deploy/images/${MACHINE}/${image}-${MACHINE}${MACHINE_SUFFIX}.tar.bz2"
         bbnote "Installing ${src}"
         tar -C ${IMAGE_ROOTFS}/var/lib/machines/${name} -xf ${src}
     done