From bad6a4092e7f87c5310ff342bc0d766a44bcf8fa Mon Sep 17 00:00:00 2001
From: Nicolas Palix <nicolas.palix@imag.fr>
Date: Sat, 2 Mar 2013 22:36:28 +0100
Subject: [PATCH] Coccinelle: Fix patch output when coccicheck is used with M=
and C=
When the M variable is used, the -patch option should be given
to spatch. This patch fixes the case where C is used.
Signed-off-by: Nicolas Palix <nicolas.palix@imag.fr>
Signed-off-by: Michal Marek <mmarek@suse.cz>
---
scripts/coccicheck | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/scripts/coccicheck b/scripts/coccicheck
index 6d492c096ade..06fcb3333247 100755
--- a/scripts/coccicheck
+++ b/scripts/coccicheck
@@ -29,10 +29,14 @@ else
if [ "$KBUILD_EXTMOD" = "" ] ; then
OPTIONS="-dir $srctree $COCCIINCLUDE"
else
- OPTIONS="-dir $KBUILD_EXTMOD -patch $srctree $COCCIINCLUDE"
+ OPTIONS="-dir $KBUILD_EXTMOD $COCCIINCLUDE"
fi
fi
+if [ "$KBUILD_EXTMOD" != "" ] ; then
+ OPTIONS="-patch $srctree $OPTIONS"
+fi
+
if [ ! -x "$SPATCH" ]; then
echo 'spatch is part of the Coccinelle project and is available at http://coccinelle.lip6.fr/'
exit 1