From: Julia Lawall <julia.lawall@inria.fr>
To: Masahiro Yamada <masahiroy@kernel.org>
Cc: linux-kbuild@vger.kernel.org,
Michal Marek <michal.lkml@markovi.net>,
Gilles Muller <Gilles.Muller@lip6.fr>,
Nicolas Palix <nicolas.palix@imag.fr>,
Dominique Martinet <asmadeus@codewreck.org>,
Matthias Maennich <maennich@google.com>,
linux-kernel@vger.kernel.org, cocci@systeme.lip6.fr
Subject: Re: [Cocci] [PATCH 1/3] kbuild: do not use scripts/ld-version.sh for checking spatch version
Date: Sat, 12 Dec 2020 18:30:06 +0100 (CET) [thread overview]
Message-ID: <alpine.DEB.2.22.394.2012121829560.3058@hadrien> (raw)
In-Reply-To: <20201212165431.150750-1-masahiroy@kernel.org>
On Sun, 13 Dec 2020, Masahiro Yamada wrote:
> scripts/ld-version.sh was, as its file name implies, originally intended
> for the GNU ld version, but is (ab)used for the spatch version too.
>
> Use 'sort -CV' for the version comparison, then coccicheck does not need
> to use scripts/ld-version.sh. Fix nsdeps as well.
>
> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Applied, thanks.
julia
> ---
>
> scripts/coccicheck | 14 +++++---------
> scripts/nsdeps | 4 +---
> 2 files changed, 6 insertions(+), 12 deletions(-)
>
> diff --git a/scripts/coccicheck b/scripts/coccicheck
> index 209bb0427b43..d7f6b7ff130a 100755
> --- a/scripts/coccicheck
> +++ b/scripts/coccicheck
> @@ -16,7 +16,6 @@ if [ ! -x "$SPATCH" ]; then
> fi
>
> SPATCH_VERSION=$($SPATCH --version | head -1 | awk '{print $3}')
> -SPATCH_VERSION_NUM=$(echo $SPATCH_VERSION | ${DIR}/scripts/ld-version.sh)
>
> USE_JOBS="no"
> $SPATCH --help | grep "\-\-jobs" > /dev/null && USE_JOBS="yes"
> @@ -186,14 +185,11 @@ coccinelle () {
>
> OPT=`grep "Options:" $COCCI | cut -d':' -f2`
> REQ=`grep "Requires:" $COCCI | cut -d':' -f2 | sed "s| ||"`
> - REQ_NUM=$(echo $REQ | ${DIR}/scripts/ld-version.sh)
> - if [ "$REQ_NUM" != "0" ] ; then
> - if [ "$SPATCH_VERSION_NUM" -lt "$REQ_NUM" ] ; then
> - echo "Skipping coccinelle SmPL patch: $COCCI"
> - echo "You have coccinelle: $SPATCH_VERSION"
> - echo "This SmPL patch requires: $REQ"
> - return
> - fi
> + if [ -n "$REQ" ] && ! { echo "$REQ"; echo "$SPATCH_VERSION"; } | sort -CV ; then
> + echo "Skipping coccinelle SmPL patch: $COCCI"
> + echo "You have coccinelle: $SPATCH_VERSION"
> + echo "This SmPL patch requires: $REQ"
> + return
> fi
>
> # The option '--parse-cocci' can be used to syntactically check the SmPL files.
> diff --git a/scripts/nsdeps b/scripts/nsdeps
> index dab4c1a0e27d..e8ce2a4d704a 100644
> --- a/scripts/nsdeps
> +++ b/scripts/nsdeps
> @@ -12,11 +12,9 @@ if [ ! -x "$SPATCH" ]; then
> exit 1
> fi
>
> -SPATCH_REQ_VERSION_NUM=$(echo $SPATCH_REQ_VERSION | ${DIR}/scripts/ld-version.sh)
> SPATCH_VERSION=$($SPATCH --version | head -1 | awk '{print $3}')
> -SPATCH_VERSION_NUM=$(echo $SPATCH_VERSION | ${DIR}/scripts/ld-version.sh)
>
> -if [ "$SPATCH_VERSION_NUM" -lt "$SPATCH_REQ_VERSION_NUM" ] ; then
> +if ! { echo "$SPATCH_REQ_VERSION"; echo "$SPATCH_VERSION"; } | sort -CV ; then
> echo "spatch needs to be version $SPATCH_REQ_VERSION or higher"
> exit 1
> fi
> --
> 2.27.0
>
> _______________________________________________
> Cocci mailing list
> Cocci@systeme.lip6.fr
> https://systeme.lip6.fr/mailman/listinfo/cocci
>
prev parent reply other threads:[~2020-12-12 17:31 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-12 16:54 [PATCH 1/3] kbuild: do not use scripts/ld-version.sh for checking spatch version Masahiro Yamada
2020-12-12 16:54 ` [PATCH 2/3] kbuild: LD_VERSION redenomination Masahiro Yamada
2020-12-14 23:05 ` Will Deacon
2020-12-15 13:48 ` Thomas Bogendoerfer
2021-01-28 6:38 ` Masahiro Yamada
2020-12-12 16:54 ` [PATCH 3/3] kbuild: rewrite ld-version.sh in shell script Masahiro Yamada
2020-12-12 17:48 ` Dominique Martinet
2020-12-21 14:23 ` Masahiro Yamada
2020-12-12 20:21 ` kernel test robot
2020-12-12 20:53 ` kernel test robot
2020-12-12 21:42 ` kernel test robot
2020-12-12 21:47 ` David Laight
2020-12-21 14:29 ` Masahiro Yamada
2020-12-21 14:51 ` David Laight
2020-12-12 17:30 ` Julia Lawall [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.DEB.2.22.394.2012121829560.3058@hadrien \
--to=julia.lawall@inria.fr \
--cc=Gilles.Muller@lip6.fr \
--cc=asmadeus@codewreck.org \
--cc=cocci@systeme.lip6.fr \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=maennich@google.com \
--cc=masahiroy@kernel.org \
--cc=michal.lkml@markovi.net \
--cc=nicolas.palix@imag.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).