build: fix missing x86-specific help output

PATCH In review Andres Salomon 2 participants 3 messages Apr 26, 2008 – Apr 28, 2008 Kbuild

Share & tools

Andres Salomon

author

2008-04-26 02:32 UTC #0 lore raw

PATCH 1/4 build: fix missing x86-specific help output

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 <[email protected]>

---
 Makefile |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

Makefile +3 -3

index 3dbc826..e77149e 100644
@@ -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), \

Signature · 1 line

1.5.5

Andres Salomon

author

2008-04-28 15:15 UTC #1 lore raw

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

Quoted 39 lines · On Fri, 25 Apr 2008 22:34:58 -0400 Andres Salomon <[email protected]> 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 <[email protected]>
---
 Makefile |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
Makefile +3 -3
index 3dbc826..e77149e 100644
@@ -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), \

Sam Ravnborg

2008-04-28 20:46 UTC #2 lore raw

Quoted 28 lines · Andres Salomon

Note that this one is a general x86 fix, I probably should've separated it out from the other three.
Quoted 22 lines · On Fri, 25 Apr 2008 22:34:58 -0400 Andres Salomon <[email protected]> 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 <[email protected]>
---
 Makefile |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
Makefile +0 -0
index 3dbc826..e77149e 100644
@@ -1170,7 +1170,7 @@ rpm: include/config/kernel.release FORCE
 # Brief documentation of the typical targets used
 # ---------------------------------------------------------------------------
 

Quoted 3 lines

Makefile rpm: include/config/kernel.release FORCE · line 1174
Quoted 3 lines
Makefile +1 -1
-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.

Quoted 11 lines

Makefile help: · line 1222

Quoted 11 lines

Makefile +2 -2

 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