Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753068Ab0GCV0j (ORCPT ); Sat, 3 Jul 2010 17:26:39 -0400 Received: from mgw1.diku.dk ([130.225.96.91]:43699 "EHLO mgw1.diku.dk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751264Ab0GCV0i (ORCPT ); Sat, 3 Jul 2010 17:26:38 -0400 From: Nicolas Palix To: Kulikov Vasiliy Subject: Re: [PATCH] coccicheck: use $KBUILD_EXTMOD when available Date: Sat, 3 Jul 2010 21:49:30 +0200 User-Agent: KMail/1.13.2 (Linux/2.6.32-22-generic; KDE/4.4.2; i686; ; ) Cc: Kernel Janitors , Julia Lawall , Gilles Muller , Michal Marek , Sam Ravnborg , Joerg Roedel , cocci@diku.dk, linux-kernel@vger.kernel.org References: <1278170438-8136-1-git-send-email-segooon@gmail.com> In-Reply-To: <1278170438-8136-1-git-send-email-segooon@gmail.com> MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Message-Id: <201007032149.30704.npalix@diku.dk> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2659 Lines: 95 Hi, On Saturday 03 July 2010 17:20:34 Kulikov Vasiliy wrote: > Use $KBUILD_EXTMOD instead of $srctree when the latter is not null > to use make M=somedir. > > Signed-off-by: Kulikov Vasiliy > --- > scripts/coccicheck | 8 +++++++- > 1 files changed, 7 insertions(+), 1 deletions(-) > > diff --git a/scripts/coccicheck b/scripts/coccicheck > index b8bcf1f..7d66a55 100755 > --- a/scripts/coccicheck > +++ b/scripts/coccicheck > @@ -1,5 +1,11 @@ > #!/bin/sh > > +if [ -n "$KBUILD_EXTMOD" ]; then > + CHECK_DIR="$KBUILD_EXTMOD" > +else > + CHECK_DIR="$srctree" > +fi > + > SPATCH="`which ${SPATCH:=spatch}`" > > if [ "$C" = "1" -o "$C" = "2" ]; then > @@ -64,7 +70,7 @@ coccinelle () { > echo ' http://coccinelle.lip6.fr/' > echo '' > > - $SPATCH -D $MODE $FLAGS -sp_file $COCCI $OPT -dir $srctree || exit 1 > + $SPATCH -D $MODE $FLAGS -sp_file $COCCI $OPT -dir $CHECK_DIR || exit 1 > else > $SPATCH -D $MODE $FLAGS -sp_file $COCCI $OPT $OPTIONS || exit 1 > fi > In doing so, the output of the patch mode will produce patches relative to $KBUILD_EXTMOD. I am not sure of what most of developers want but if the patches must be relative to the Linux kernel root, the following patch must be used. Any preference ? diff --git a/scripts/coccicheck b/scripts/coccicheck index b8bcf1f..cda66a3 100755 --- a/scripts/coccicheck +++ b/scripts/coccicheck @@ -1,5 +1,12 @@ #!/bin/sh +if [ -n "$KBUILD_EXTMOD" ]; then + CHECK_DIR="$srctree/$KBUILD_EXTMOD" + FLAGS="-patch $srctree" +else + CHECK_DIR="$srctree" +fi + SPATCH="`which ${SPATCH:=spatch}`" if [ "$C" = "1" -o "$C" = "2" ]; then @@ -10,12 +17,12 @@ if [ "$C" = "1" -o "$C" = "2" ]; then # OPTIONS=$* # Workaround for Coccinelle < 0.2.3 - FLAGS="-I $srctree/include -very_quiet" + FLAGS="-I $srctree/include -very_quiet $FLAGS" shift $(( $# - 1 )) OPTIONS=$1 else ONLINE=0 - FLAGS="-very_quiet" + FLAGS="-very_quiet $FLAGS" fi if [ ! -x "$SPATCH" ]; then @@ -64,7 +71,7 @@ coccinelle () { echo ' http://coccinelle.lip6.fr/' echo '' - $SPATCH -D $MODE $FLAGS -sp_file $COCCI $OPT -dir $srctree || exit 1 + $SPATCH -D $MODE $FLAGS -sp_file $COCCI $OPT -dir $CHECK_DIR || exit 1 else $SPATCH -D $MODE $FLAGS -sp_file $COCCI $OPT $OPTIONS || exit 1 fi -- Nicolas Palix Web: http://www.diku.dk/~npalix/ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/