[Buildroot] [PATCH] merge_config.sh: Fix merging buildroot config files

yamada.masahiro at socionext.com yamada.masahiro at socionext.com
Mon Nov 5 08:23:54 UTC 2018


Hi.

> -----Original Message-----
> From: Nasser [mailto:afshin.nasser at gmail.com]
> Sent: Sunday, November 04, 2018 6:32 AM
> To: Petr Vorel <petr.vorel at gmail.com>
> Cc: Arnout Vandecappelle <arnout at mind.be>; Yamada, Masahiro/山田 真弘
> <yamada.masahiro at socionext.com>; buildroot at buildroot.org;
> matthew.weber at rockwellcollins.com; angelo.compagnucci at gmail.com
> Subject: Re: [PATCH] merge_config.sh: Fix merging buildroot config files
> 
> Hi Petr, Mahasiro,
> On Fri, Nov 02, 2018 at 11:50:58PM +0100, Petr Vorel wrote:
> > Hi Arnout,
> >
> > > > How about this?
> > > > https://patchwork.kernel.org/patch/10665119/
> >
> > >  Perhaps it's better to make the entire pattern explicit, like:
> >
> > > SED_CONFIG_EXP="s/^\(${CONFIG_PREFIX}[a-zA-Z0-9_]*\)=.*$\|^#
> > > \(${CONFIG_PREFIX}[a-zA-Z0-9_]*\) is not set$/\1\2/p"
> >
> > > (\1\2 works because only one of the two subexpressions matches, so either
> \1 or
> > > \2 must be empty).
> > I'd prefer original Masahiro's version - it's easier to read and without
> > duplicity.
> >
> I agree with you. +1 for not having duplicity.
> This patch makes merge_config.sh to work well in many more tests. I'm waiting
> for Masahiro's version to be applied to
> the his kbuild tree and then re-prepare the patch here.


OK, I think Arnout's one is unreadable, but
we can make it readable by splitting the complex pattern into two.

I posted this for comparison.
https://patchwork.kernel.org/patch/10667571/

Thanks.



More information about the buildroot mailing list