3 files changed, 3 insertions, 21 deletions
diff --git a/meta-agl-core/conf/distro/poky-agl.conf b/meta-agl-core/conf/distro/poky-agl.conf
index dd20e4cf6..b304d6dab 100644
--- a/meta-agl-core/conf/distro/poky-agl.conf
+++ b/meta-agl-core/conf/distro/poky-agl.conf
@@ -159,8 +159,8 @@ AGL_DEFAULT_INITRAMFS_FSTYPES ?= "ext4.gz"
 
 # DEFAULT IMAGE_FSTYPES for AGL (no - BSPs should not set this)
 #
-IMAGE_FSTYPES := "${AGL_DEFAULT_IMAGE_FSTYPES} ${AGL_EXTRA_IMAGE_FSTYPES}"
-INITRAMFS_FSTYPES := "${AGL_DEFAULT_INITRAMFS_FSTYPES} ${AGL_EXTRA_INITRAMFS_FSTYPES}"
+IMAGE_FSTYPES = "${AGL_DEFAULT_IMAGE_FSTYPES} ${AGL_EXTRA_IMAGE_FSTYPES}"
+INITRAMFS_FSTYPES = "${AGL_DEFAULT_INITRAMFS_FSTYPES} ${AGL_EXTRA_INITRAMFS_FSTYPES}"
 #
 # THE FUTURE is 'wic'
 # IMAGE_FSTYPES_append = " wic"
diff --git a/meta-agl-core/recipes-platform/images/agl-image-boot.inc b/meta-agl-core/recipes-platform/images/agl-image-boot.inc
index 825393978..1c9ebda87 100644
--- a/meta-agl-core/recipes-platform/images/agl-image-boot.inc
+++ b/meta-agl-core/recipes-platform/images/agl-image-boot.inc
@@ -5,6 +5,3 @@ inherit core-image
 IMAGE_INSTALL = "${CORE_IMAGE_EXTRA_INSTALL}"
 
 IMAGE_ROOTFS_SIZE ?= "8192"
-
-# Allow extra IMAGE_FSTYPES to be added by boards configs
-IMAGE_FSTYPES += "${AGL_EXTRA_IMAGE_FSTYPES}"
diff --git a/meta-agl-core/recipes-platform/images/agl-image-minimal.inc b/meta-agl-core/recipes-platform/images/agl-image-minimal.inc
index c08219bf6..50b6336de 100644
--- a/meta-agl-core/recipes-platform/images/agl-image-minimal.inc
+++ b/meta-agl-core/recipes-platform/images/agl-image-minimal.inc
@@ -1,16 +1 @@
-IMAGE_LINGUAS = " "
-
-# Reset IMAGE_FSTYPES to our specific desired value to avoid issues
-# with _append or _remove declarations against IMAGE_FSTYPES.
-# Note that this snippet needs to be before (core-)image bbclass
-# inclusion to take effect.
-python __anonymous () {
-    d.setVar("IMAGE_FSTYPES", d.getVar("AGL_DEFAULT_IMAGE_FSTYPES"))
-    d.appendVar("IMAGE_FSTYPES", " " + d.getVar("AGL_EXTRA_IMAGE_FSTYPES"))
-}
-
-inherit core-image
-
-IMAGE_INSTALL = "${CORE_IMAGE_EXTRA_INSTALL}"
-
-IMAGE_ROOTFS_SIZE ?= "8192"
+require agl-image-boot.inc