To handle the Kingfisher supporting ULCB builds modifying the
IMAGE_LINK_NAME variable, add a MACHINE_SUFFIX variable that is
defined based on a new "kingfisher" feature being present in
AGL_FEATURES. Since so far only one platform has this issue,
this simple approach seems better than attempting to derive
the suffix from IMAGE_LINK_NAME using anonymous Python.
Bug-AGL: SPEC-4023
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: Ida769fbeb57208934f738dc5d1c867ab63c40bff
(cherry picked from commit
aac67cb520cd945f960189d12ea9bbe1815891de)
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(':')
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