diff options
| author |   Scott Murray <scott.murray@konsulko.com> | 2021-01-04 12:02:16 -0500 |
|---|---|---|
| committer |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2021-01-05 12:37:09 +0000 |
| commit | 61fe56a82a679107767b08932fa13368210c8926 (patch) | |
| tree | cec6951c64a316f6e59b356d5ff779b0af5a8e7b /meta-agl-core/recipes-platform/images | |
| parent | d3f1db09e74f0ecd991f199b3bb0bc1efc8af5cb (diff) | |
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 <scott.murray@konsulko.com>
Change-Id: Ife1dca4c3ff961a9f693631ec0dac498114d395d
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/25859
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Tested-by: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
ci-image-build: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
ci-image-boot-test: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
Diffstat (limited to 'meta-agl-core/recipes-platform/images')
| -rw-r--r-- | meta-agl-core/recipes-platform/images/agl-image-minimal.inc | 8 |
1 files 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" |