From b81c6beb388cafa6de9ca1baa13c3d529ca2f2d8 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Fri, 23 Apr 2021 16:32:24 -0400 Subject: 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 Change-Id: Id655683c705678dd3ab1caff8980dba06f46a1bc Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/26292 Reviewed-by: Jan-Simon Moeller Tested-by: Jenkins Job builder account (cherry picked from commit e02c02ddbfeb9398268c3a4c4eabed1617de8ac3) Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/26264 ci-image-build: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account --- meta-agl-core/conf/distro/poky-agl.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-agl-core/conf/distro') diff --git a/meta-agl-core/conf/distro/poky-agl.conf b/meta-agl-core/conf/distro/poky-agl.conf index dd20e4cf6..b304d6dab 100644 --- a/meta-agl-core/conf/distro/poky-agl.conf +++ b/meta-agl-core/conf/distro/poky-agl.conf @@ -159,8 +159,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" -- cgit 1.2.3-korg