From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Subject: Re: [ptxdist] [PATCH] barebox: fix CONFIG_DEFAULT_ENVIRONMENT_PATH on oldconfig/nconfig/menuconfig
Date: Wed, 13 Sep 2017 17:12:04 +0200 [thread overview]
Message-ID: <20170913151204.354v4nickfq3aa3f@pengutronix.de> (raw)
In-Reply-To: <67a410dd-521b-1e63-931e-a19198c6a19a@pengutronix.de>
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 <bst@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
next prev parent reply other threads:[~2017-09-13 15:12 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-28 10:31 Bastian Stender
2017-09-11 9:10 ` Bastian Stender
2017-09-13 15:12 ` Michael Olbrich [this message]
2017-09-13 15:51 ` Bastian Stender
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170913151204.354v4nickfq3aa3f@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox