Code Review
/
AGL
/
meta-agl-devel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
lxc-host-image-minimal: Handle Kingfisher image names
[AGL/meta-agl-devel.git]
/
meta-agl-lxc
/
recipes-platform
/
images
/
lxc-host-image-minimal.bb
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
f702da1
..
11eb513
100644
(file)
--- 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"
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(':')
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}
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
bbnote "Installing ${src}"
tar -C ${IMAGE_ROOTFS}/var/lib/machines/${name} -xf ${src}
done