MIME-Version: 1.0
References: <CGME20230208130800eucas1p2fbcba741dbd7483bb0a9b2d4b6c6dbfd@eucas1p2.samsung.com>
 <20230208130732.63172-1-l.stelmach@samsung.com>
In-Reply-To: <20230208130732.63172-1-l.stelmach@samsung.com>
From:   Masahiro Yamada <masahiroy@kernel.org>
Date:   Thu, 16 Feb 2023 21:17:24 +0900
Message-ID: <CAK7LNASjsRYyRCAy_EujsX1o2ybR3KUQRA2HuPxeN=ppUpBa_A@mail.gmail.com>
Subject: Re: [PATCH v2] 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 Wed, Feb 8, 2023 at 10:08 PM =C5=81ukasz Stelmach <l.stelmach@samsung.co=
m> 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.
>
> Change-Id: I129f3a0b4205a76d8c42020f8adb72b1889d75fb
> Signed-off-by: =C5=81ukasz Stelmach <l.stelmach@samsung.com>
> ---
> Changes in v2:
> - suppress reports reports if an option was "not set" in input files
>   but is missing from the filnal .config due to unmet dependecies.
> - apply the same logic to suppress some reports during the merging
>   phase
>
> BTW. Do you think adding "| sort -u" after "grep -w" to avoid reports
> about repeated entries may make sense or do you want such reports to
> be printed.
>
>  scripts/kconfig/merge_config.sh | 30 ++++++++++++++++++++----------
>  1 file changed, 20 insertions(+), 10 deletions(-)
>
> diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_conf=
ig.sh
> index e5b46980c22a..1086bdc7abf2 100755
> --- a/scripts/kconfig/merge_config.sh
> +++ b/scripts/kconfig/merge_config.sh
> @@ -144,12 +144,17 @@ for ORIG_MERGE_FILE in $MERGE_LIST ; do
>                         echo
>                         BUILTIN_FLAG=3Dtrue
>                 elif [ "x$PREV_VAL" !=3D "x$NEW_VAL" ] ; then
> -                       echo Value of $CFG is redefined by fragment $ORIG=
_MERGE_FILE:
> -                       echo Previous  value: $PREV_VAL
> -                       echo New value:       $NEW_VAL
> -                       echo
> -                       if [ "$STRICT" =3D "true" ]; then
> -                               STRICT_MODE_VIOLATED=3Dtrue
> +                       if [ \( "x$PREV_VAL" !=3D "x$CFG=3Dn" -a \
> +                               "x$PREV_VAL" !=3D "x# $CFG is not set" \)=
 -o \
> +                            \( "x$NEW_VAL" !=3D "x"  -a \


In which case does $NEW_VAL become empty?

I think it is opposite.
$PREV_VAL might be empty, $NEW_VAL may specified as =3Dn.


> +                               "x$NEW_VAL" !=3D "x# $CFG is not set" \) =
]; then
> +                               echo Value of $CFG is redefined by fragme=
nt $ORIG_MERGE_FILE:
> +                               echo Previous  value: $PREV_VAL
> +                               echo New value:       $NEW_VAL
> +                               echo
> +                               if [ "$STRICT" =3D "true" ]; then
> +                                       STRICT_MODE_VIOLATED=3Dtrue
> +                               fi
>                         fi
>                 elif [ "$WARNREDUN" =3D "true" ]; then
>                         echo Value of $CFG is redundant by fragment $ORIG=
_MERGE_FILE:
> @@ -196,9 +201,14 @@ 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" -a \
> +                       "x$REQUESTED_VAL" !=3D "x# $CFG is not set" \) -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
>


--=20
Best Regards
Masahiro Yamada