Add support integration type of multi partition

Existing AGL IC container integration was not supporting
multi partition integration.

This patch enable multi partition integration using wic.

Bug-AGL: SPEC-4777

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

1 files changed, 2 insertions, 17 deletions

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 de2ea5ca..49b7bc8e 100644
--- 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
@@ -1,15 +1,10 @@
 # Integration type support for install guest root filesystem into host image.
 
+require recipes-platform/images/agl-lxc-multiconfig-build.inc
+
 # 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(':')
-        dependency = 'mc::' + mc + ':' + image + ':do_image_complete'
-        d.appendVarFlag('do_rootfs', 'mcdepends', ' ' + dependency)
-}
-
 install_container_images() {
     for c in ${CONTAINER_IMAGES}; do
         config=${c%:*}
@@ -23,14 +18,4 @@ install_container_images() {
     done
 }
 
-#
-# Force rebuild of rootfs on every build to work around mcdepends issue
-#
-# NOTE:
-# This is currently required as bitbake fails to trigger do_rootfs
-# sometimes even when the guest image has in fact rebuilt.  This is
-# being investigated with upstream.
-#
-do_rootfs[nostamp] = "1"
-
 ROOTFS_POSTPROCESS_COMMAND += "install_container_images; "