diff options
| author |   Scott Murray <scott.murray@konsulko.com> | 2021-04-23 16:32:24 -0400 |
|---|---|---|
| committer |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2021-05-05 15:04:09 +0000 |
| commit | e02c02ddbfeb9398268c3a4c4eabed1617de8ac3 (patch) | |
| tree | 463d32e427924d457acd594d9e9e1fdb35dae4ab /meta-agl-core/conf/distro | |
| parent | d1571afd2682744d757639ede83fd5f26b1a70b0 (diff) | |
meta-agl-core: remove IMAGE_FSTYPES override
Remove the anonymous python logic added to override any changes
to IMAGE_FSTYPES via _append/_remove by BSPs to fix SPEC-3741.
The updated Renesas BSP no longer does so, and removing this
logic avoids issues when using meta-agl-core with distribution
configurations other than poky-agl.
Additionally:
- Change the IMAGE_FSTYPES and INITRAMFS_FSTYPES assignments in
poky-agl.conf back to regular ("=") instead of immediate
(":=") so that things like the _appends being done to
AGL_DEFAULT_IMAGE_FSTYPES for netboot and CI usecases will
take affect. They were only currently working because of the
later evaluation in the anonymous python logic that is being
removed.
- Rationalize agl-image-minimal.inc to just include
agl-image-boot.inc, and remove the unnecessary use of the
AGL_EXTRA_IMAGE_FSTYPES variable in agl-image-boot.inc.
Bug-AGL: SPEC-3897
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: Id655683c705678dd3ab1caff8980dba06f46a1bc
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/26292
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Tested-by: Jenkins Job builder account
Diffstat (limited to 'meta-agl-core/conf/distro')
| -rw-r--r-- | meta-agl-core/conf/distro/poky-agl.conf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta-agl-core/conf/distro/poky-agl.conf b/meta-agl-core/conf/distro/poky-agl.conf index 495959d0e..a5cf79d44 100644 --- a/meta-agl-core/conf/distro/poky-agl.conf +++ b/meta-agl-core/conf/distro/poky-agl.conf @@ -144,8 +144,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" |