[PATCH] arm/fvpboot: change the execution order of do_write_fvpboot_conf

[PATCH] arm/fvpboot: change the execution order of do_write_fvpboot_conf

[Huifeng Zhang]

add the do_write_fvpboot_conf function into IMAGE_POSTPROCESS_COMMAND
so that this function can be called after the build system created the
final image output files.

It's possible that bitbake doesn't run start from the do_rootfs task but
run start from do_image_<type> at the stage of image generation.

For example, there are multiple partitions in the wic file and the
grub.cfg file is placed to the first partition and the rootfs is placed
to the second partition. At this time, if we change the content of
the grub.cfg file resided in the related recipe's directory and build,
the do_rootfs task won't be run by bitbake but a new wic file will be
generated. In this situation, the fvpconf file also won't be updated and
the 'bp.virtioblockdevice.image_path' is still pointing to a old image
file.

Issue-Id: SCM-3724
Signed-off-by: Huifeng Zhang <Huifeng.Zhang@arm.com>
Change-Id: I7a41afa1d7471d09b60d118c4a6c99c57a6b548c
---
 meta-arm/classes/fvpboot.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-arm/classes/fvpboot.bbclass b/meta-arm/classes/fvpboot.bbclass
index de66d7c..d02742d 100644
--- a/meta-arm/classes/fvpboot.bbclass
+++ b/meta-arm/classes/fvpboot.bbclass
@@ -25,7 +25,7 @@ EXTRA_IMAGEDEPENDS += "${FVP_PROVIDER}"
 
 inherit image-artifact-names
 
-addtask do_write_fvpboot_conf after do_rootfs before do_image
+IMAGE_POSTPROCESS_COMMAND += "do_write_fvpboot_conf;"
 python do_write_fvpboot_conf() {
     # Note that currently this JSON file is in development and the format may
     # change at any point, so it should always be used with a matching runfvp.
-- 
2.34.1

Re: [PATCH] arm/fvpboot: change the execution order of do_write_fvpboot_conf

[Jon Mason]

On Tue, 14 Dec 2021 16:19:48 +0800, Huifeng Zhang wrote:
> add the do_write_fvpboot_conf function into IMAGE_POSTPROCESS_COMMAND
> so that this function can be called after the build system created the
> final image output files.
> 
> It's possible that bitbake doesn't run start from the do_rootfs task but
> run start from do_image_<type> at the stage of image generation.
> 
> [...]

Applied, thanks!

[1/1] arm/fvpboot: change the execution order of do_write_fvpboot_conf
      commit: ebf413ea3c710d6987684bc3dbb0fa2ff4d38e19

Best regards,
-- 
Jon Mason <jon.mason@arm.com>