[PATCH] images: add missing FORCE prerequisite

[PATCH] images: add missing FORCE prerequisite

[Sascha Hauer]

With a985c67be ("fixdep: sync with Linux") we now warn about a missing
FORCE prerequisite. Obey that warning and add it to the %.img target.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 images/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/images/Makefile b/images/Makefile
index 9007911278..295a5cd713 100644
--- a/images/Makefile
+++ b/images/Makefile
@@ -146,7 +146,7 @@ $(obj)/barebox.z: $(obj)/../barebox.bin FORCE
 missing_fw = $(strip $(wildcard $(obj)/$(FILE_$(@F)).missing-firmware $(basename $(obj)/$(FILE_$(@F))).missing-firmware))
 
 .SECONDEXPANSION:
-$(obj)/%.img: $(obj)/$$(FILE_$$(@F))
+$(obj)/%.img: $(obj)/$$(FILE_$$(@F)) FORCE
 	$(Q)if [ -z $(FILE_$(@F)) ]; then echo "FILE_$(@F) empty!"; false; fi
 	$(Q)$(if $(missing_fw),cat $(missing_fw) >$@.missing-firmware,rm -f $@.missing-firmware)
 	$(call if_changed,$(if $(missing_fw),delete,shipped))
-- 
2.39.5

Re: [PATCH] images: add missing FORCE prerequisite

[Ahmad Fatoum]

Hello Sascha,

On 12.12.24 09:15, Sascha Hauer wrote:
> With a985c67be ("fixdep: sync with Linux") we now warn about a missing
> FORCE prerequisite. Obey that warning and add it to the %.img target.
> 
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> ---
>  images/Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/images/Makefile b/images/Makefile
> index 9007911278..295a5cd713 100644
> --- a/images/Makefile
> +++ b/images/Makefile
> @@ -146,7 +146,7 @@ $(obj)/barebox.z: $(obj)/../barebox.bin FORCE
>  missing_fw = $(strip $(wildcard $(obj)/$(FILE_$(@F)).missing-firmware $(basename $(obj)/$(FILE_$(@F))).missing-firmware))
>  
>  .SECONDEXPANSION:
> -$(obj)/%.img: $(obj)/$$(FILE_$$(@F))
> +$(obj)/%.img: $(obj)/$$(FILE_$$(@F)) FORCE
>  	$(Q)if [ -z $(FILE_$(@F)) ]; then echo "FILE_$(@F) empty!"; false; fi
>  	$(Q)$(if $(missing_fw),cat $(missing_fw) >$@.missing-firmware,rm -f $@.missing-firmware)

Shouldn't this become a command/rule and if_changed / if_changed_rule
be then used instead?

That's what I did in https://lore.barebox.org/barebox/0b5f4524-975d-427f-b527-6fc543391edb@pengutronix.de/

Let me send a v2.

Cheers,
Ahmad

>  	$(call if_changed,$(if $(missing_fw),delete,shipped))


-- 
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 |