On Mon, Sep 11, 2017 at 11:10:10AM +0200, Bastian Stender wrote: > On 07/28/2017 12:31 PM, Bastian Stender wrote: > > ptxdist adds ".ptxdist-defaultenv" if PTXCONF_BAREBOX_EXTRA_ENV is > > enabled. If barebox oldconfig/nconfig/menuconfig do not modify the > > configuration the barebox config from the BSP is copied without > > executing the prepare stage responsible for amending > > ".ptxdist-defaultenv". > > > > Steps to reproduce: > > > > ptxdist targetinstall barebox > > ptxdist menuconfig barebox (without modification) > > ptxdist drop barebox.compile > > ptxdist targetinstall barebox > > > > Now CONFIG_DEFAULT_ENVIRONMENT_PATH is missing ".ptxdist-defaultenv" > > leading to an unexpected environment. > > > > Fix this by amending ".ptxdist-defaultenv" after > > oldconfig/nconfig/menuconfig. > > > > Signed-off-by: Bastian Stender <b...@pengutronix.de> > > --- > > rules/barebox.make | 7 +++++++ > > 1 file changed, 7 insertions(+) > > > > diff --git a/rules/barebox.make b/rules/barebox.make > > index bdfefe8c6..d391ec9eb 100644 > > --- a/rules/barebox.make > > +++ b/rules/barebox.make > > @@ -208,4 +208,11 @@ barebox_oldconfig barebox_menuconfig barebox_nconfig: > > $(STATEDIR)/barebox.extrac > > cp $(BAREBOX_DIR)/.config $(BAREBOX_CONFIG); \ > > fi > > +ifdef PTXCONF_BAREBOX_EXTRA_ENV > > + @if test -e $(BAREBOX_CONFIG); then \ > > + @sed -i -e "s,^\(CONFIG_DEFAULT_ENVIRONMENT_PATH=.*\)\"$$,\1 > > .ptxdist-defaultenv\"," \
no @ here > > + $(BAREBOX_DIR)/.config missing '; \' at the end of the line. > > + fi > > +endif > > + > > # vim: syntax=make > > > > Any thoughts on this patch? Even with the fixes above, it only works in some cases. If *config is aborted with ctrl-c then the problem still exists. Maybe move the sed magic to compile and only do it if it's not there already? Michael -- 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
