From 4cf3fb4ab2856ebedff16afefbb107145b8b923d Mon Sep 17 00:00:00 2001 From: Jan-Simon Möller Date: Mon, 21 Dec 2020 19:10:10 +0100 Subject: Ignore BSP IMAGE_FSTYPES changes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Scott Murray 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 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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 825393978..185a00258 100644 --- a/meta-agl-core/recipes-platform/images/agl-image-minimal.inc +++ b/meta-agl-core/recipes-platform/images/agl-image-minimal.inc @@ -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}" -- cgit 1.2.3-korg