Re: [ptxdist] [PATCH 3/3] u-boot: Move image copying from targetinstall to install.

[Michael Olbrich <m.olbrich@pengutronix.de>]

On Fri, Aug 26, 2022 at 03:35:37PM +0200, Christian Melki wrote:
> This seems like a potential issue in several packages.
> When signing u-boot images in tf-a, tf-a has u-boot as
> a dependency. But u-boot doesn't install images to be processed
> until targetinstall, which leads to problems.
> 
> Some things might be targetinstall. But resulting images destined
> for the imagedir aren't really targetinstall unless
> they are also copied to rootfs.

This is broken. 'ptxdist clean root' will remove the files from images/ and
then only targetinstall is executed. So the files won't be copied again.

If other packages need those files, then they must be copied to
$(U_BOOT_PKGDIR) in the install stage.

Michael

> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> ---
>  rules/u-boot.make | 15 ++++++++-------
>  1 file changed, 8 insertions(+), 7 deletions(-)
> 
> diff --git a/rules/u-boot.make b/rules/u-boot.make
> index 0b632e8b2..bdbe03ffe 100644
> --- a/rules/u-boot.make
> +++ b/rules/u-boot.make
> @@ -133,14 +133,7 @@ endif
>  
>  $(STATEDIR)/u-boot.install:
>  	@$(call targetinfo)
> -	@$(call touch)
> -
> -# ----------------------------------------------------------------------------
> -# Target-Install
> -# ----------------------------------------------------------------------------
>  
> -$(STATEDIR)/u-boot.targetinstall:
> -	@$(call targetinfo)
>  	@$(call world/image-clean, U_BOOT)
>  ifdef PTXCONF_U_BOOT_INSTALL_U_BOOT_BIN
>  	@$(call ptx/image-install, U_BOOT, $(U_BOOT_BUILD_DIR)/u-boot.bin)
> @@ -194,6 +187,14 @@ ifndef PTXCONF_U_BOOT_ENV_IMAGE_NONE
>  	@$(call ptx/image-install, U_BOOT, $(U_BOOT_BUILD_DIR)/u-boot-env.img)
>  endif
>  
> +	@$(call touch)
> +
> +# ----------------------------------------------------------------------------
> +# Target-Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/u-boot.targetinstall:
> +	@$(call targetinfo)
>  ifdef PTXCONF_U_BOOT_BOOT_SCRIPT
>  	@$(call install_init, u-boot)
>  	@$(call install_fixup, u-boot, PRIORITY, optional)
> -- 
> 2.34.1
> 
> 
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |