Re: BUG: scripts/kconfig/merge_config.sh: typo in variable name

[Mirsad Todorovac]

On 3/22/23 04:40, Masahiro Yamada wrote:
> On Wed, Mar 22, 2023 at 5:14 AM Mirsad Goran Todorovac
> <mirsad.todorovac@xxxxxxxxxxxx> wrote:
> > On 3/21/2023 2:04 PM, Mirsad Goran Todorovac wrote:
> > > Hi all,
> > >
> > > There is a typo in variable name in scripts/kconfig/merge_config.sh, with the
> > > script returning:
> > >
> > > $ ./scripts/kconfig/merge_config.sh -y -m ../.config tools/testing/selftests/net/config
> > > ./scripts/kconfig/merge_config.sh: 148: ./scripts/kconfig/merge_config.sh: Previous: not found
> > >
> > > Problem is probably best explained by this diff:
> > >
> > > ---
> > > diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh
> > > index 32620de473ad..902eb429b9db 100755
> > > --- a/scripts/kconfig/merge_config.sh
> > > +++ b/scripts/kconfig/merge_config.sh
> > > @@ -145,7 +145,7 @@ for ORIG_MERGE_FILE in $MERGE_LIST ; do
> > >                   NEW_VAL=$(grep -w $CFG $MERGE_FILE)
> > >                   BUILTIN_FLAG=false
> > >                   if [ "$BUILTIN" = "true" ] && [ "${NEW_VAL#CONFIG_*=}" = "m" ] && [ "${PREV_VAL#CONFIG_*=}" = "y" ]; then
> > > -                       ${WARNOVVERIDE} Previous  value: $PREV_VAL
> > > +                       ${WARNOVERRIDE} Previous  value: $PREV_VAL
> > >                           ${WARNOVERRIDE} New value:       $NEW_VAL
> > >                           ${WARNOVERRIDE} -y passed, will not demote y to m
> > >                           ${WARNOVERRIDE}
> > >
> > > Hope this helps.
> >
> > P.S.
> >
> > Later I thought of searching the committer of the patch that introduced the change,
> > so I Cc:ed Mark.
> >
> > Best regards,
> > Mirsad
>
> Good catch.

Thanks.

> Will you please send a patch with your signed-off?

Submitted. I hope I did it right this time.

Best regards,
Mirsad

--
Mirsad Goran Todorovac
Sistem inženjer
Grafički fakultet | Akademija likovnih umjetnosti
Sveučilište u Zagrebu

System engineer
Faculty of Graphic Arts | Academy of Fine Arts
University of Zagreb, Republic of Croatia