2023-03-21 13:04:27

by Mirsad Todorovac

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

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.

Best regards,
Mirsad

--
Mirsad Todorovac
System engineer
Faculty of Graphic Arts | Academy of Fine Arts
University of Zagreb
Republic of Croatia, the European Union

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

2023-03-21 20:14:24

by Mirsad Todorovac

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

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

--
Mirsad 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
tel. +385 (0)1 3711 451
mob. +385 91 57 88 355

2023-03-22 03:55:04

by Masahiro Yamada

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

On Wed, Mar 22, 2023 at 5:14 AM Mirsad Goran Todorovac
<[email protected]> 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.

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







> --
> Mirsad 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
> tel. +385 (0)1 3711 451
> mob. +385 91 57 88 355



--
Best Regards
Masahiro Yamada

2023-03-22 09:04:33

by Mirsad Todorovac

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

On 3/22/23 04:40, Masahiro Yamada wrote:
> On Wed, Mar 22, 2023 at 5:14 AM Mirsad Goran Todorovac
> <[email protected]> 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