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@xxxxxxxxxx>
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@xxxxxxxxxxxxxxx
> https://systeme.lip6.fr/mailman/listinfo/cocci
>
