public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/4] build: fix missing x86-specific help output
@ 2008-04-26  2:34 Andres Salomon
  2008-04-28 15:18 ` Andres Salomon
  0 siblings, 1 reply; 3+ messages in thread
From: Andres Salomon @ 2008-04-26  2:34 UTC (permalink / raw)
  To: sam; +Cc: Andrew Morton, linux-kernel, linux-kbuild, tglx, mingo, hpa


Normally 'make help' spits out architecture-specific targets (including
things like foo_defconfig).  However, it looks like ARCH was never changed
to SRCARCH during the x86 transition; the makefile still looks in
arch/i386/configs for arch-specific config files (if ARCH is i386, that is).

This changes it to use SRCARCH, which makes it properly display things
like i386_defconfig and x86_64_defconfig.

Signed-off-by: Andres Salomon <dilinger@debian.org>
---
 Makefile |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 3dbc826..e77149e 100644
--- a/Makefile
+++ b/Makefile
@@ -1170,7 +1170,7 @@ rpm: include/config/kernel.release FORCE
 # Brief documentation of the typical targets used
 # ---------------------------------------------------------------------------
 
-boards := $(wildcard $(srctree)/arch/$(ARCH)/configs/*_defconfig)
+boards := $(wildcard $(srctree)/arch/$(SRCARCH)/configs/*_defconfig)
 boards := $(notdir $(boards))
 
 help:
@@ -1217,9 +1217,9 @@ help:
 	@echo  'Documentation targets:'
 	@$(MAKE) -f $(srctree)/Documentation/DocBook/Makefile dochelp
 	@echo  ''
-	@echo  'Architecture specific targets ($(ARCH)):'
+	@echo  'Architecture specific targets ($(SRCARCH)):'
 	@$(if $(archhelp),$(archhelp),\
-		echo '  No architecture specific help defined for $(ARCH)')
+		echo '  No architecture specific help defined for $(SRCARCH)')
 	@echo  ''
 	@$(if $(boards), \
 		$(foreach b, $(boards), \
-- 
1.5.5


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH 1/4] build: fix missing x86-specific help output
  2008-04-26  2:34 [PATCH 1/4] build: fix missing x86-specific help output Andres Salomon
@ 2008-04-28 15:18 ` Andres Salomon
  2008-04-28 20:46   ` Sam Ravnborg
  0 siblings, 1 reply; 3+ messages in thread
From: Andres Salomon @ 2008-04-28 15:18 UTC (permalink / raw)
  To: Andres Salomon
  Cc: sam, Andrew Morton, linux-kernel, linux-kbuild, tglx, mingo, hpa

Note that this one is a general x86 fix, I probably should've separated it
out from the other three.

On Fri, 25 Apr 2008 22:34:58 -0400
Andres Salomon <dilinger@queued.net> wrote:

> 
> Normally 'make help' spits out architecture-specific targets (including
> things like foo_defconfig).  However, it looks like ARCH was never changed
> to SRCARCH during the x86 transition; the makefile still looks in
> arch/i386/configs for arch-specific config files (if ARCH is i386, that is).
> 
> This changes it to use SRCARCH, which makes it properly display things
> like i386_defconfig and x86_64_defconfig.
> 
> Signed-off-by: Andres Salomon <dilinger@debian.org>
> ---
>  Makefile |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/Makefile b/Makefile
> index 3dbc826..e77149e 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1170,7 +1170,7 @@ rpm: include/config/kernel.release FORCE
>  # Brief documentation of the typical targets used
>  # ---------------------------------------------------------------------------
>  
> -boards := $(wildcard $(srctree)/arch/$(ARCH)/configs/*_defconfig)
> +boards := $(wildcard $(srctree)/arch/$(SRCARCH)/configs/*_defconfig)
>  boards := $(notdir $(boards))
>  
>  help:
> @@ -1217,9 +1217,9 @@ help:
>  	@echo  'Documentation targets:'
>  	@$(MAKE) -f $(srctree)/Documentation/DocBook/Makefile dochelp
>  	@echo  ''
> -	@echo  'Architecture specific targets ($(ARCH)):'
> +	@echo  'Architecture specific targets ($(SRCARCH)):'
>  	@$(if $(archhelp),$(archhelp),\
> -		echo '  No architecture specific help defined for $(ARCH)')
> +		echo '  No architecture specific help defined for $(SRCARCH)')
>  	@echo  ''
>  	@$(if $(boards), \
>  		$(foreach b, $(boards), \

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH 1/4] build: fix missing x86-specific help output
  2008-04-28 15:18 ` Andres Salomon
@ 2008-04-28 20:46   ` Sam Ravnborg
  0 siblings, 0 replies; 3+ messages in thread
From: Sam Ravnborg @ 2008-04-28 20:46 UTC (permalink / raw)
  To: Andres Salomon
  Cc: Andrew Morton, linux-kernel, linux-kbuild, tglx, mingo, hpa

On Mon, Apr 28, 2008 at 11:18:39AM -0400, Andres Salomon wrote:
> Note that this one is a general x86 fix, I probably should've separated it
> out from the other three.
> 
> On Fri, 25 Apr 2008 22:34:58 -0400
> Andres Salomon <dilinger@queued.net> wrote:
> 
> > 
> > Normally 'make help' spits out architecture-specific targets (including
> > things like foo_defconfig).  However, it looks like ARCH was never changed
> > to SRCARCH during the x86 transition; the makefile still looks in
> > arch/i386/configs for arch-specific config files (if ARCH is i386, that is).
> > 
> > This changes it to use SRCARCH, which makes it properly display things
> > like i386_defconfig and x86_64_defconfig.
> > 
> > Signed-off-by: Andres Salomon <dilinger@debian.org>
> > ---
> >  Makefile |    6 +++---
> >  1 files changed, 3 insertions(+), 3 deletions(-)
> > 
> > diff --git a/Makefile b/Makefile
> > index 3dbc826..e77149e 100644
> > --- a/Makefile
> > +++ b/Makefile
> > @@ -1170,7 +1170,7 @@ rpm: include/config/kernel.release FORCE
> >  # Brief documentation of the typical targets used
> >  # ---------------------------------------------------------------------------
> >  
> > -boards := $(wildcard $(srctree)/arch/$(ARCH)/configs/*_defconfig)
> > +boards := $(wildcard $(srctree)/arch/$(SRCARCH)/configs/*_defconfig)
> >  boards := $(notdir $(boards))

I already had this fix in a previous patch.

> >  
> >  help:
> > @@ -1217,9 +1217,9 @@ help:
> >  	@echo  'Documentation targets:'
> >  	@$(MAKE) -f $(srctree)/Documentation/DocBook/Makefile dochelp
> >  	@echo  ''
> > -	@echo  'Architecture specific targets ($(ARCH)):'
> > +	@echo  'Architecture specific targets ($(SRCARCH)):'
> >  	@$(if $(archhelp),$(archhelp),\
> > -		echo '  No architecture specific help defined for $(ARCH)')
> > +		echo '  No architecture specific help defined for $(SRCARCH)')

So I used only this part.

	Sam

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2008-04-28 20:46 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-04-26  2:34 [PATCH 1/4] build: fix missing x86-specific help output Andres Salomon
2008-04-28 15:18 ` Andres Salomon
2008-04-28 20:46   ` Sam Ravnborg

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox