Re: [ptxdist] [PATCH 1/2] barebox: remove superfluous ptxd_source_kconfig calls

[Roland Hieber <rhi@pengutronix.de>]

On Thu, Aug 08, 2024 at 04:14:41PM +0200, Michael Olbrich wrote:
> On Fri, Aug 02, 2024 at 12:25:28PM +0200, Roland Hieber wrote:
> > These calls make the PTXCONF_* variables from the ptxconfig and the
> > platformconfig available in the local shell environment, but no PTXCONF_
> > variable is used later in the shell call. This is probably a left-over
> > from when the defaultenv preparation was made layer-aware in commit
> > 41cb4d9f9287d85ae11b (2018-07-24, Michael Olbrich: "barebox: support
> > layers with BAREBOX_EXTRA_ENV_PATH").
> 
> No, this is wrong. ptxd_filter_dir will replace and @VARIABLE@ and the
> files can come from the BSP and can contain @PTXCONF_*@ patterns that
> should be replaces.

Okay. The two other patches should still apply without this one.

 - Roland

> 
> Michael
> 
> > Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> > ---
> >  rules/barebox.make | 4 +---
> >  1 file changed, 1 insertion(+), 3 deletions(-)
> > 
> > diff --git a/rules/barebox.make b/rules/barebox.make
> > index c0d9c5744e4a..bcb96e607b91 100644
> > --- a/rules/barebox.make
> > +++ b/rules/barebox.make
> > @@ -87,9 +87,7 @@ endif
> >  
> >  ifdef PTXCONF_BAREBOX_EXTRA_ENV
> >  	@rm -rf $(BAREBOX_BUILD_DIR)/.ptxdist-defaultenv
> > -	@ptxd_source_kconfig "${PTXDIST_PTXCONFIG}" && \
> > -	ptxd_source_kconfig "${PTXDIST_PLATFORMCONFIG}" && \
> > -	$(foreach path, $(BAREBOX_EXTRA_ENV_PATH), \
> > +	@$(foreach path, $(BAREBOX_EXTRA_ENV_PATH), \
> >  		if [ -d "$(path)" ]; then \
> >  			ptxd_filter_dir "$(path)" \
> >  			$(BAREBOX_BUILD_DIR)/.ptxdist-defaultenv; \
> > -- 
> > 2.39.2
> > 
> > 
> > 
> 
> -- 
> 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 |
> 
> 

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