From 61fe56a82a679107767b08932fa13368210c8926 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Mon, 4 Jan 2021 12:02:16 -0500 Subject: meta-agl-core: fix IMAGE_FSTYPES override The anonymous python snippet in agl-image-minimal.inc to reset IMAGE_FSTYPES needs to be before the inherit of core-image to actually take effect when building. This was not immediately apparent from the variable expansion information visible in "bitbake -e" output. A comment explaining the snippet and this requirement has been added for clarity. Bug-AGL: SPEC-3741 Signed-off-by: Scott Murray Change-Id: Ife1dca4c3ff961a9f693631ec0dac498114d395d Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/25859 Reviewed-by: Jan-Simon Moeller Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account --- meta-agl-core/recipes-platform/images/agl-image-minimal.inc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 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 185a00258..c08219bf6 100644 --- a/meta-agl-core/recipes-platform/images/agl-image-minimal.inc +++ b/meta-agl-core/recipes-platform/images/agl-image-minimal.inc @@ -1,12 +1,16 @@ IMAGE_LINGUAS = " " -inherit core-image - +# 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" -- cgit 1.2.3-korg