MIME-Version: 1.0
References: <CGME20230203123220eucas1p2f9686f08bcb22cf1e21aefd25070282a@eucas1p2.samsung.com>
 <20230203123140.2227880-1-l.stelmach@samsung.com>
In-Reply-To: <20230203123140.2227880-1-l.stelmach@samsung.com>
From:   Masahiro Yamada <masahiroy@kernel.org>
Date:   Sun, 5 Feb 2023 03:49:37 +0900
Message-ID: <CAK7LNASSJ8X8_TpxK=SBNWrAikHg4DRQ4yYi=NQDGXqefKyGog@mail.gmail.com>
Subject: Re: [PATCH] merge_config.sh: do not report some differencess between
 input and output
To:     =?UTF-8?Q?=C5=81ukasz_Stelmach?= <l.stelmach@samsung.com>
Cc:     Marek Szyprowski <m.szyprowski@samsung.com>,
        linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Fri, Feb 3, 2023 at 9:32 PM =C5=81ukasz Stelmach <l.stelmach@samsung.com=
> wrote:
>
> If an input config file contains CONFIG_FOO=3Dn the output one
> will contain a line '# CONFIG_FOO is not set'. merge_config.sh
> should not report it as difference because the end result of
> CONFIG_FOO being disabled is achieved.
>
> Inexistence of CONFIG_FOO (because of unment dependencies) in case
> CONFIG_FOO=3Dn is requested, should also be ignored.
>
> Signed-off-by: =C5=81ukasz Stelmach <l.stelmach@samsung.com>
> ---
>  scripts/kconfig/merge_config.sh | 12 ++++++++----
>  1 file changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_conf=
ig.sh
> index e5b46980c22a..c6fd6722f1a4 100755
> --- a/scripts/kconfig/merge_config.sh
> +++ b/scripts/kconfig/merge_config.sh
> @@ -196,9 +196,13 @@ for CFG in $(sed -n -e "$SED_CONFIG_EXP1" -e "$SED_C=
ONFIG_EXP2" $TMP_FILE); do
>         REQUESTED_VAL=3D$(grep -w -e "$CFG" $TMP_FILE)
>         ACTUAL_VAL=3D$(grep -w -e "$CFG" "$KCONFIG_CONFIG" || true)
>         if [ "x$REQUESTED_VAL" !=3D "x$ACTUAL_VAL" ] ; then
> -               echo "Value requested for $CFG not in final .config"
> -               echo "Requested value:  $REQUESTED_VAL"
> -               echo "Actual value:     $ACTUAL_VAL"
> -               echo ""
> +               if [ "x$REQUESTED_VAL" !=3D "x$CFG=3Dn" -o \
> +                    \( "x$ACTUAL_VAL" !=3D "x"  -a \
> +                       "x$ACTUAL_VAL" !=3D "x# $CFG is not set" \) ]; th=
en
> +                       echo "Value requested for $CFG not in final .conf=
ig"
> +                       echo "Requested value:  $REQUESTED_VAL"
> +                       echo "Actual value:     $ACTUAL_VAL"
> +                       echo ""
> +               fi
>         fi
>  done
> --
> 2.30.2
>


[Problem 1]

The behaviour is inconsistent
between =3Dn and "is not set".


 Requested: CONFIG_FOO=3Dn
 Actual   : missing due to unmet dep

     -> suppress the report


 Requested: CONFIG_FOO is not set
 Actual   : missing due to unmet dep

     -> show the report


[Problem 2]

This patch introduces another consistency
because line 148 may report something similar.


--
Best Regards
Masahiro Yamada