linux-kernel - Re: [PATCH v2] merge_config.sh: Check error codes from make

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAK7LNARaVoxWVi679JkR1w+m-RRH1PLdvfJc1ba4n2N2bZR_5g@mail.gmail.com>
Date:   Wed, 21 Aug 2019 00:07:06 +0900
From:   Masahiro Yamada <yamada.masahiro@...ionext.com>
To:     Mark Brown <broonie@...nel.org>
Cc:     Guillaume Tucker <guillaume.tucker@...labora.com>,
        Linux Kbuild mailing list <linux-kbuild@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH v2] merge_config.sh: Check error codes from make

On Tue, Aug 20, 2019 at 5:07 AM Mark Brown <broonie@...nel.org> wrote:
>
> When we execute make after merging the configurations we ignore any
> errors it produces causing whatever is running merge_config.sh to be
> unaware of any failures.  This issue was noticed by Guillaume Tucker
> while looking at problems with testing of clang only builds in KernelCI
> which caused Kbuild to be unable to find a working host compiler.
>
> This implementation was suggested by Yamada-san.
>
> Suggested-by: Masahiro Yamada <yamada.masahiro@...ionext.com>
> Reported-by: Guillaume Tucker <guillaume.tucker@...labora.com>
> Signed-off-by: Mark Brown <broonie@...nel.org>
> ---

Applied to linux-kbuild.
Thanks.

>  scripts/kconfig/merge_config.sh | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh
> index d924c51d28b7..bec246719aea 100755
> --- a/scripts/kconfig/merge_config.sh
> +++ b/scripts/kconfig/merge_config.sh
> @@ -13,12 +13,12 @@
>  #  Copyright (c) 2009-2010 Wind River Systems, Inc.
>  #  Copyright 2011 Linaro
>
> +set -e
> +
>  clean_up() {
>         rm -f $TMP_FILE
>         rm -f $MERGE_FILE
> -       exit
>  }
> -trap clean_up HUP INT TERM
>
>  usage() {
>         echo "Usage: $0 [OPTIONS] [CONFIG [...]]"
> @@ -110,6 +110,9 @@ TMP_FILE=$(mktemp ./.tmp.config.XXXXXXXXXX)
>  MERGE_FILE=$(mktemp ./.merge_tmp.config.XXXXXXXXXX)
>
>  echo "Using $INITFILE as base"
> +
> +trap clean_up EXIT
> +
>  cat $INITFILE > $TMP_FILE
>
>  # Merge files, printing warnings on overridden values
> @@ -155,7 +158,6 @@ if [ "$RUNMAKE" = "false" ]; then
>         echo "#"
>         echo "# merged configuration written to $KCONFIG_CONFIG (needs make)"
>         echo "#"
> -       clean_up
>         exit
>  fi
>
> @@ -185,5 +187,3 @@ for CFG in $(sed -n -e "$SED_CONFIG_EXP1" -e "$SED_CONFIG_EXP2" $TMP_FILE); do
>                 echo ""
>         fi
>  done
> -
> -clean_up
> --
> 2.20.1
>


-- 
Best Regards
Masahiro Yamada