From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner+w=401wt.eu-S1755093AbXKEHbt@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1755093AbXKEHbt (ORCPT <rfc822;w@1wt.eu>);
	Mon, 5 Nov 2007 02:31:49 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752761AbXKEHbl
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Mon, 5 Nov 2007 02:31:41 -0500
Received: from pasmtpb.tele.dk ([80.160.77.98]:39892 "EHLO pasmtpB.tele.dk"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751458AbXKEHbk (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Mon, 5 Nov 2007 02:31:40 -0500
Date: Mon, 5 Nov 2007 08:33:17 +0100
From: Sam Ravnborg <sam@ravnborg.org>
To: WANG Cong <xiyou.wangcong@gmail.com>
Cc: LKML <linux-kernel@vger.kernel.org>, linux-kbuild@vger.kernel.org,
       Andrew Morton <akpm@osdl.org>
Subject: Re: [Git Patch] Makefile: fix wrong dirs when making cscope
Message-ID: <20071105073317.GA26441@uranus.ravnborg.org>
References: <20071105070953.GB2461@hacking>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20071105070953.GB2461@hacking>
User-Agent: Mutt/1.4.2.1i
Sender: linux-kernel-owner@vger.kernel.org
X-Mailing-List: linux-kernel@vger.kernel.org

Hi Wang.

Thanks for this fix, but I have a few comments. See below.

On Mon, Nov 05, 2007 at 03:09:53PM +0800, WANG Cong wrote:
> 
> Hi, Sam!
> 
> This patch fixed the following errors when doing "make cscope" and
> "make cscope ARCH=um".
> 
>   FILELST cscope.files
> find: arch/i386: No such file or directory
>   MAKE    cscope.out
> 
> 
>   FILELST cscope.files
> find: include/asm-i386: No such file or directory
>   MAKE    cscope.out
> 
> 
> Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com>
> Cc: Sam Ravnborg <sam@ravnborg.org>
> 
> ---
>  Makefile |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> Index: linux-2.6/Makefile
> ===================================================================
> --- linux-2.6.orig/Makefile
> +++ linux-2.6/Makefile
> @@ -1322,7 +1322,7 @@ ALLSOURCE_ARCHS := $(ARCH) $(SRCARCH)
>  endif
>  
>  define find-sources
> -        ( for arch in $(ALLSOURCE_ARCHS) ; do \
> +        ( for arch in `echo $(ALLSOURCE_ARCHS)|sed -e "s/i386/x86/"`; do \
>  	       find $(__srctree)arch/$${arch} $(RCS_FIND_IGNORE) \
>  	            -name $1 -print; \
>  	  done ; \

Could you change this such that the substitution takes places where we
assign ALLSOURCE_ARCHS so all potential users benefit from this fix.
And on top of this fix it so x86_64 is also replaced by x86 so we fix
both x86 architectures.


> @@ -1331,7 +1331,7 @@ define find-sources
>  	  find $(__srctree)include $(RCS_FIND_IGNORE) \
>  	       \( -name config -o -name 'asm-*' \) -prune \
>  	       -o -name $1 -print; \
> -	  for arch in $(ALLINCLUDE_ARCHS) ; do \
> +	  for arch in `echo $(ALLINCLUDE_ARCHS)|sed -e "s/i386/x86/"`; do \
>  	       find $(__srctree)include/asm-$${arch} $(RCS_FIND_IGNORE) \
>  	            -name $1 -print; \
>  	  done ; \
> 
Same comments for ALLINCLUDE_ARCHS

PS. Yout patch may be obsoleted by ongoing work to eliminate
ARCH=i386 / ARCH=x86_64. But if/when this hits mainline I dunno so
please do the requested changes and send me a new patch.

Tanks,
	Sam