summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Palix <nicolas.palix@imag.fr>2013-07-03 16:41:01 +0200
committerMichal Marek <mmarek@suse.cz>2013-07-03 22:58:20 +0200
commitec97946ed038f4b3faa587bc76152b198805b0c4 (patch)
tree048774b662e1b340d00decd7072e4f85efb1657c
parent93f14468491747d6d3efd0b3a42785b1d51a127a (diff)
downloadkernel-common-ec97946ed038f4b3faa587bc76152b198805b0c4.tar.gz
kernel-common-ec97946ed038f4b3faa587bc76152b198805b0c4.tar.bz2
kernel-common-ec97946ed038f4b3faa587bc76152b198805b0c4.zip
Coccinelle: Update information about the minimal version required
The naming convention of options has changed one year ago. The options have been recently updated in the cocci file and in scripts/coccicheck. This patch also adds this information in the documentation. Signed-off-by: Nicolas Palix <nicolas.palix@imag.fr> Signed-off-by: Michal Marek <mmarek@suse.cz>
-rw-r--r--Documentation/coccinelle.txt19
-rwxr-xr-xscripts/coccicheck5
2 files changed, 13 insertions, 11 deletions
diff --git a/Documentation/coccinelle.txt b/Documentation/coccinelle.txt
index 81a329fcd532..7f773d51fdd9 100644
--- a/Documentation/coccinelle.txt
+++ b/Documentation/coccinelle.txt
@@ -6,15 +6,17 @@ Copyright 2010 Gilles Muller <Gilles.Muller@lip6.fr>
Getting Coccinelle
~~~~~~~~~~~~~~~~~~~~
-The semantic patches included in the kernel use the 'virtual rule'
-feature which was introduced in Coccinelle version 0.1.11.
+The semantic patches included in the kernel use features and options
+which are provided by Coccinelle version 1.0.0-rc11 and above.
+Using earlier versions will fail as the option names used by
+the Coccinelle files and coccicheck have been updated.
-Coccinelle (>=0.2.0) is available through the package manager
+Coccinelle is available through the package manager
of many distributions, e.g. :
- - Debian (>=squeeze)
- - Fedora (>=13)
- - Ubuntu (>=10.04 Lucid Lynx)
+ - Debian
+ - Fedora
+ - Ubuntu
- OpenSUSE
- Arch Linux
- NetBSD
@@ -36,11 +38,6 @@ as a regular user, and install it with
sudo make install
-The semantic patches in the kernel will work best with Coccinelle version
-0.2.4 or later. Using earlier versions may incur some parse errors in the
-semantic patch code, but any results that are obtained should still be
-correct.
-
Using Coccinelle on the Linux kernel
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/scripts/coccicheck b/scripts/coccicheck
index d3757adb1260..bbf901afb606 100755
--- a/scripts/coccicheck
+++ b/scripts/coccicheck
@@ -1,5 +1,10 @@
#!/bin/bash
+#
+# This script requires at least spatch
+# version 1.0.0-rc11.
+#
+
SPATCH="`which ${SPATCH:=spatch}`"
trap kill_running SIGTERM SIGINT