Ignore BSP IMAGE_FSTYPES changes 46/25846/3
authorJan-Simon Möller <jsmoeller@linuxfoundation.org>
Mon, 21 Dec 2020 18:10:10 +0000 (19:10 +0100)
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>
Tue, 22 Dec 2020 05:47:06 +0000 (05:47 +0000)
Add anonymous python snippet in agl-image-minimal.inc to reset
the value of IMAGE_FSTYPES to AGL_DEFAULT_IMAGE_FSTYPES plus
AGL_EXTRA_IMAGE_FSTYPES (i.e. the value defined in poky-agl.conf).
This is a very big hammer, but at present seems the best way to
avoid the build time/space costs from BSP appends adding extra
types that are not required.

Bug-AGL: SPEC-3741
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: Idad57d0371ae59058b2b1acffbeae85db97aa91d
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/25846

meta-agl-core/recipes-platform/images/agl-image-minimal.inc

index 8253939..185a002 100644 (file)
@@ -2,9 +2,11 @@ IMAGE_LINGUAS = " "
 
 inherit core-image
 
+python __anonymous () {
+    d.setVar("IMAGE_FSTYPES", d.getVar("AGL_DEFAULT_IMAGE_FSTYPES"))
+    d.appendVar("IMAGE_FSTYPES", " " + d.getVar("AGL_EXTRA_IMAGE_FSTYPES"))
+}
+
 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}"