Re: [ptxdist] [PATCH v2 2/2] barebox_mlo: use images/barebox-*-mlo.img as images

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

On Thu, May 15, 2014 at 11:10:09AM +0200, Teresa Gámez wrote:
> New barebox versions may create multiple MLO images.
> Adapted barebox_mlo rule to handle this.
> 
> Signed-off-by: Teresa Gámez <t.gamez@phytec.de>

Thanks, applied.

Michael

> ---
> Changes in v2:
> - Reworked second if statement
> - Added tick marks
> 
>  rules/barebox_mlo.make |   15 ++++++++++++---
>  1 files changed, 12 insertions(+), 3 deletions(-)
> 
> diff --git a/rules/barebox_mlo.make b/rules/barebox_mlo.make
> index 3c53575..f90955c 100644
> --- a/rules/barebox_mlo.make
> +++ b/rules/barebox_mlo.make
> @@ -76,9 +76,18 @@ $(STATEDIR)/barebox_mlo.install:
>  $(STATEDIR)/barebox_mlo.targetinstall:
>  	@$(call targetinfo)
>  #	#barebox renamed barebox.bin.ift to MLO, so fall back to barebox.bin.ift
> -	@ptxd_get_path "$(BAREBOX_MLO_DIR)/MLO" \
> -		"$(BAREBOX_MLO_DIR)/barebox.bin.ift" && \
> -	install -D -m644 "$${ptxd_reply}" "$(IMAGEDIR)/MLO"
> +	@rm -f $(IMAGEDIR)/MLO
> +	@for image in `ls $(BAREBOX_MLO_DIR)/images/barebox-*-mlo.img`; do \
> +		install -D -m644 $$image $(IMAGEDIR)/`basename $$image`; \
> +		if [ ! -e "$(IMAGEDIR)/MLO" ]; then \
> +			ln -sf `basename $$image` $(IMAGEDIR)/MLO; \
> +		fi; \
> +	done
> +	@if [ ! -e "$(IMAGEDIR)/MLO" ]; then \
> +		ptxd_get_path "$(BAREBOX_MLO_DIR)/MLO" \
> +			"$(BAREBOX_MLO_DIR)/barebox.bin.ift" && \
> +		install -D -m644 "$${ptxd_reply}" "$(IMAGEDIR)/MLO"; \
> +	fi
>  
>  	@$(call touch)
>  
> -- 
> 1.7.0.4
> 
> 
> -- 
> ptxdist mailing list
> ptxdist@pengutronix.de

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de