[PATCH] Fix headers_check for O= builds; disable automatic check on UML.

David Woodhouse dwmw2 at infradead.unroutableorg
Wed Nov 29 11:15:03 EST 2006


Commit:     0e7af8d04ecb4f6ba8cd1f731f036a004ad0e174
Parent:     e0fafda36a2fc5ecf8d11771f6c01c523b2a1fd8
commit 0e7af8d04ecb4f6ba8cd1f731f036a004ad0e174
Author:     David Woodhouse <dwmw2 at infradead.org>
AuthorDate: Fri Oct 13 16:04:23 2006 +0100
Commit:     Linus Torvalds <torvalds at g5.osdl.org>
CommitDate: Fri Oct 13 08:35:39 2006 -0700

    [PATCH] Fix headers_check for O= builds; disable automatic check on UML.
    
     * make header_check work with O=
    
    Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
    Signed-off-by: Linus Torvalds <torvalds at osdl.org>
---
 Makefile |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index f242829..eebf310 100644
--- a/Makefile
+++ b/Makefile
@@ -742,7 +742,7 @@ endif # ifdef CONFIG_KALLSYMS
 # vmlinux image - including updated kernel symbols
 vmlinux: $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) $(kallsyms.o) FORCE
 ifdef CONFIG_HEADERS_CHECK
-	$(Q)$(MAKE) headers_check
+	$(Q)$(MAKE) -f $(srctree)/Makefile headers_check
 endif
 	$(call if_changed_rule,vmlinux__)
 	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost $@
@@ -935,7 +935,7 @@ headers_install_all: include/linux/versi
 
 PHONY += headers_install
 headers_install: include/linux/version.h scripts_basic FORCE
-	@if [ ! -r include/asm-$(ARCH)/Kbuild ]; then \
+	@if [ ! -r $(srctree)/include/asm-$(ARCH)/Kbuild ]; then \
 	  echo '*** Error: Headers not exportable for this architecture ($(ARCH))'; \
 	  exit 1 ; fi
 	$(Q)$(MAKE) $(build)=scripts scripts/unifdef


More information about the Commits-kernel mailing list