summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorLuis R. Rodriguez <mcgrof@kernel.org>2016-06-29 18:14:57 -0400
committerMichal Marek <mmarek@suse.com>2016-07-22 06:13:39 -0400
commita9e064c00413fb59e7236be81578024ab0ebe6b2 (patch)
treee5b2672100a8aa650d102093247b6b19709f4000 /scripts
parentdd951fc1b67b6511d6c8f0449f3d451df374ebce (diff)
coccicheck: add support for requring a coccinelle version
Enable Coccinelle SmPL patches to require a specific version of Coccinelle. In the event that the version does not match we just inform the user, if the user asked to go through all SmPL patches we just inform them of the need for a new version of coccinelle for the SmPL patch and continue on with the rest. This uses the simple kernel scripts/ld-version.sh to create a weight on the version provided by spatch. The -dirty attribute is ignored if supplied, the benefit of scripts/ld-version.sh is it has a long history and well tested. While at it, document the // Options stuff as well. v4: Document // Options and // Requires as well on Documentation/coccinelle.txt. Signed-off-by: Luis R. Rodriguez <mcgrof@kernel.org> Acked-by: Nicolas Palix <nicolas.palix@imag.fr> Signed-off-by: Michal Marek <mmarek@suse.com>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/coccicheck14
1 files changed, 14 insertions, 0 deletions
diff --git a/scripts/coccicheck b/scripts/coccicheck
index 081ba5bff79c..f9293ab04a8b 100755
--- a/scripts/coccicheck
+++ b/scripts/coccicheck
@@ -5,6 +5,7 @@
5# version 1.0.0-rc11. 5# version 1.0.0-rc11.
6# 6#
7 7
8DIR="$(dirname $(readlink -f $0))/.."
8SPATCH="`which ${SPATCH:=spatch}`" 9SPATCH="`which ${SPATCH:=spatch}`"
9 10
10if [ ! -x "$SPATCH" ]; then 11if [ ! -x "$SPATCH" ]; then
@@ -12,6 +13,9 @@ if [ ! -x "$SPATCH" ]; then
12 exit 1 13 exit 1
13fi 14fi
14 15
16SPATCH_VERSION=$($SPATCH --version | head -1 | awk '{print $3}')
17SPATCH_VERSION_NUM=$(echo $SPATCH_VERSION | ${DIR}/scripts/ld-version.sh)
18
15USE_JOBS="no" 19USE_JOBS="no"
16$SPATCH --help | grep "\-\-jobs" > /dev/null && USE_JOBS="yes" 20$SPATCH --help | grep "\-\-jobs" > /dev/null && USE_JOBS="yes"
17 21
@@ -171,6 +175,16 @@ coccinelle () {
171 COCCI="$1" 175 COCCI="$1"
172 176
173 OPT=`grep "Option" $COCCI | cut -d':' -f2` 177 OPT=`grep "Option" $COCCI | cut -d':' -f2`
178 REQ=`grep "Requires" $COCCI | cut -d':' -f2 | sed "s| ||"`
179 REQ_NUM=$(echo $REQ | ${DIR}/scripts/ld-version.sh)
180 if [ "$REQ_NUM" != "0" ] ; then
181 if [ "$SPATCH_VERSION_NUM" -lt "$REQ_NUM" ] ; then
182 echo "Skipping coccinele SmPL patch: $COCCI"
183 echo "You have coccinelle: $SPATCH_VERSION"
184 echo "This SmPL patch requires: $REQ"
185 return
186 fi
187 fi
174 188
175# The option '--parse-cocci' can be used to syntactically check the SmPL files. 189# The option '--parse-cocci' can be used to syntactically check the SmPL files.
176# 190#