Commit d06d15d2 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] Fix for Makefiles to get KBUILD_OUTPUT working

From: Mathieu Chouquet-Stringer <mchouque@online.fr>

If you use O=/someotherdir or KBUILD_OUTPUT=/someotherdir on the following
architectures: alpha, mips, sh and cris, the build process is probably
going to fail at one point or another, depending on the target you used,
because make can't find scripts/Makefile.build or scripts/Makefile.clean.

The following patch fixes this, I greped the whole tree and these four were
the only "offenders" I found.
parent 64fa9f96
...@@ -106,10 +106,10 @@ boot := arch/alpha/boot ...@@ -106,10 +106,10 @@ boot := arch/alpha/boot
all boot: $(boot)/vmlinux.gz all boot: $(boot)/vmlinux.gz
$(boot)/vmlinux.gz: vmlinux $(boot)/vmlinux.gz: vmlinux
$(Q)$(MAKE) -f scripts/Makefile.build obj=$(boot) $@ $(Q)$(MAKE) $(build)=$(boot) $@
bootimage bootpfile bootpzfile: vmlinux bootimage bootpfile bootpzfile: vmlinux
$(Q)$(MAKE) -f scripts/Makefile.build obj=$(boot) $(boot)/$@ $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
prepare: include/asm-$(ARCH)/asm_offsets.h prepare: include/asm-$(ARCH)/asm_offsets.h
...@@ -121,7 +121,7 @@ include/asm-$(ARCH)/asm_offsets.h: arch/$(ARCH)/kernel/asm-offsets.s ...@@ -121,7 +121,7 @@ include/asm-$(ARCH)/asm_offsets.h: arch/$(ARCH)/kernel/asm-offsets.s
$(call filechk,gen-asm-offsets) $(call filechk,gen-asm-offsets)
archclean: archclean:
$(Q)$(MAKE) -f scripts/Makefile.clean obj=$(boot) $(Q)$(MAKE) $(clean)=$(boot)
CLEAN_FILES += include/asm-$(ARCH)/asm_offsets.h CLEAN_FILES += include/asm-$(ARCH)/asm_offsets.h
......
...@@ -81,7 +81,7 @@ compressed: zImage ...@@ -81,7 +81,7 @@ compressed: zImage
archmrproper: archmrproper:
archclean: archclean:
$(Q)$(MAKE) -f scripts/Makefile.clean obj=arch/$(ARCH)/boot $(Q)$(MAKE) $(clean)=arch/$(ARCH)/boot
rm -f timage vmlinux.bin cramfs.img rm -f timage vmlinux.bin cramfs.img
rm -rf $(LD_SCRIPT).tmp rm -rf $(LD_SCRIPT).tmp
......
...@@ -686,7 +686,7 @@ vmlinux.64: vmlinux ...@@ -686,7 +686,7 @@ vmlinux.64: vmlinux
--change-addresses=0xa800000080000000 $< $@ --change-addresses=0xa800000080000000 $< $@
endif endif
makeboot =$(Q)$(MAKE) -f scripts/Makefile.build obj=arch/mips/boot $(1) makeboot =$(Q)$(MAKE) $(build)=arch/mips/boot $(1)
ifdef CONFIG_SGI_IP27 ifdef CONFIG_SGI_IP27
all: vmlinux.64 all: vmlinux.64
...@@ -708,9 +708,9 @@ CLEAN_FILES += vmlinux.ecoff \ ...@@ -708,9 +708,9 @@ CLEAN_FILES += vmlinux.ecoff \
vmlinux.rm200 vmlinux.rm200
archclean: archclean:
@$(MAKE) -f scripts/Makefile.clean obj=arch/mips/boot @$(MAKE) $(clean)=arch/mips/boot
@$(MAKE) -f scripts/Makefile.clean obj=arch/mips/baget @$(MAKE) $(clean)=arch/mips/baget
@$(MAKE) -f scripts/Makefile.clean obj=arch/mips/lasat @$(MAKE) $(clean)=arch/mips/lasat
# Generate <asm/offset.h # Generate <asm/offset.h
# #
......
...@@ -16,5 +16,5 @@ $(obj)/zImage: $(obj)/compressed/vmlinux FORCE ...@@ -16,5 +16,5 @@ $(obj)/zImage: $(obj)/compressed/vmlinux FORCE
@echo 'Kernel: $@ is ready' @echo 'Kernel: $@ is ready'
$(obj)/compressed/vmlinux: FORCE $(obj)/compressed/vmlinux: FORCE
$(Q)$(MAKE) -f scripts/Makefile.build obj=$(obj)/compressed $@ $(Q)$(MAKE) $(build)=$(obj)/compressed $@
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment