Commit 33114c43 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Julia Lawall
Browse files

kbuild: do not use scripts/ld-version.sh for checking spatch version 



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: default avatarMasahiro Yamada <masahiroy@kernel.org>
Signed-off-by: default avatarJulia Lawall <Julia.Lawall@inria.fr>
parent 2b076054

scripts/coccicheck

+5 −9
Original line number Diff line number Diff line
@@ -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,15 +185,12 @@ 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

    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

    fi



#   The option '--parse-cocci' can be used to syntactically check the SmPL files.

#

scripts/nsdeps

+1 −3
Original line number Diff line number Diff line
@@ -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

CRA Git | Maintained and supported by SUSTech CRA and CCSE