From: Bastian Stender <bst@pengutronix.de>
To: ptxdist@pengutronix.de
Subject: Re: [ptxdist] [PATCH v2] barebox: fix CONFIG_DEFAULT_ENVIRONMENT_PATH on (interrupted) oldconfig/nconfig/menuconfig
Date: Thu, 14 Sep 2017 10:13:23 +0200 [thread overview]
Message-ID: <26e2e0af-ab6c-46b8-9e5f-9d4fe1a3fc4d@pengutronix.de> (raw)
In-Reply-To: <20170914064728.lqnecql2sf7md733@pengutronix.de>
On 09/14/2017 08:47 AM, Michael Olbrich wrote:
> On Wed, Sep 13, 2017 at 06:49:45PM +0200, 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". The same happens on interrupted *config.
>>
>> 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" before compiling in case it
>> has not been amended before.
>>
>> Signed-off-by: Bastian Stender <bst@pengutronix.de>
>> ---
>> rules/barebox.make | 11 +++++++++--
>> 1 file changed, 9 insertions(+), 2 deletions(-)
>>
>> diff --git a/rules/barebox.make b/rules/barebox.make
>> index bdfefe8c6..f37f2f5f2 100644
>> --- a/rules/barebox.make
>> +++ b/rules/barebox.make
>> @@ -89,8 +89,6 @@ ifdef PTXCONF_BAREBOX_EXTRA_ENV
>> else \
>> cp "$(path)" $(BAREBOX_DIR)/.ptxdist-defaultenv/; \
>> fi;)
>> - @sed -i -e "s,^\(CONFIG_DEFAULT_ENVIRONMENT_PATH=.*\)\"$$,\1 .ptxdist-defaultenv\"," \
>> - $(BAREBOX_DIR)/.config
>> endif
>>
>> @$(call touch)
>> @@ -101,6 +99,15 @@ endif
>>
>> $(STATEDIR)/barebox.compile:
>> @$(call targetinfo)
>> +
>> +ifdef PTXCONF_BAREBOX_EXTRA_ENV
>> + @if test -e $(BAREBOX_CONFIG) -a \
>
> Any reason for this check? $(BAREBOX_CONFIG) should always exist at that
> point because of the dependencies.
Right.
>
>> + $(shell grep -c -e "^CONFIG_DEFAULT_ENVIRONMENT_PATH=.*\.ptxdist-defaultenv" $(BAREBOX_DIR)/.config) -eq 0; then \
>
> Don't use '$(shell ...)' here. That makes the execution time a bit fuzzy.
> '$$(grep ...) should work.
Okay, I'll send v3.
Bastian
--
Pengutronix e.K.
Industrial Linux Solutions
http://www.pengutronix.de/
Peiner Str. 6-8, 31137 Hildesheim, Germany
Amtsgericht Hildesheim, HRA 2686
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
prev parent reply other threads:[~2017-09-14 8:13 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-13 16:49 Bastian Stender
2017-09-14 6:47 ` Michael Olbrich
2017-09-14 8:13 ` Bastian Stender [this message]
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=26e2e0af-ab6c-46b8-9e5f-9d4fe1a3fc4d@pengutronix.de \
--to=bst@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