mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Sam Ravnborg <sam@ravnborg.org>
To: linux-kernel@vger.kernel.org, Linus Torvalds <torvalds@osdl.org>
Subject: [PATCH 7/7] kbuild: fix generic asm-offsets.h support
Date: Sat, 10 Sep 2005 22:38:08 +0200	[thread overview]
Message-ID: <20050910203807.GG29334@mars.ravnborg.org> (raw)
In-Reply-To: <20050910200347.GA3762@mars.ravnborg.org>

This fixes a bug where the generated asm-offsets.h file was saved in
the source tree even with make O=.
Thanks to Stephen Rothwell <sfr@canb.auug.org.au> for the report.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

---

 Kbuild   |    5 +++--
 Makefile |    2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

8d36a62364b6b04dc7b0e9fe09f6968f4e5a1f0a
diff --git a/Kbuild b/Kbuild
--- a/Kbuild
+++ b/Kbuild
@@ -4,7 +4,7 @@
 # 1) Generate asm-offsets.h
 
 #####
-# 1) Generate asm-offsets.h 
+# 1) Generate asm-offsets.h
 #
 
 offsets-file := include/asm-$(ARCH)/asm-offsets.h
@@ -22,6 +22,7 @@ sed-$(CONFIG_MIPS) := "/^@@@/s///p"
 
 quiet_cmd_offsets = GEN     $@
 define cmd_offsets
+	mkdir -p $(dir $@); \
 	cat $< | \
 	(set -e; \
 	 echo "#ifndef __ASM_OFFSETS_H__"; \
@@ -43,6 +44,6 @@ arch/$(ARCH)/kernel/asm-offsets.s: arch/
 	$(Q)mkdir -p $(dir $@)
 	$(call if_changed_dep,cc_s_c)
 
-$(srctree)/$(offsets-file): arch/$(ARCH)/kernel/asm-offsets.s Kbuild
+$(obj)/$(offsets-file): arch/$(ARCH)/kernel/asm-offsets.s Kbuild
 	$(call cmd,offsets)
 
diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -814,7 +814,7 @@ ifneq ($(KBUILD_MODULES),)
 endif
 
 prepare0: prepare prepare1 FORCE
-	$(Q)$(MAKE) $(build)=$(srctree)
+	$(Q)$(MAKE) $(build)=.
 
 # All the preparing..
 prepare-all: prepare0


  parent reply	other threads:[~2005-09-10 20:36 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-09-10 20:03 [GIT PATCHES] final kbuild update before fix-only period Sam Ravnborg
2005-09-10 20:34 ` [PATCH 1/7] kbuild: add kernelrelease to 'make help' Sam Ravnborg
2005-09-10 20:34 ` [PATCH 2/7] kbuild: CF=<arguments> passes arguments to sparse Sam Ravnborg
2005-09-10 20:35 ` [PATCH 3/7] kbuild: adjust .version updating Sam Ravnborg
2005-09-10 20:36 ` [PATCH 4/7] kbuild: fix split-include dependency Sam Ravnborg
2005-09-10 20:36 ` [PATCH 5/7] kbuild: ignore all debugging info sections in scripts/reference_discarded.pl Sam Ravnborg
2005-09-10 20:37 ` [PATCH 6/7] kbuild: add objectify Sam Ravnborg
2005-09-10 20:38 ` Sam Ravnborg [this message]
2005-09-11 12:26 ` [GIT PATCHES] final kbuild update before fix-only period Denis Vlasenko
2005-09-11 14:00   ` Sam Ravnborg
2005-09-12  7:19     ` Denis Vlasenko

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20050910203807.GG29334@mars.ravnborg.org \
    --to=sam@ravnborg.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=torvalds@osdl.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®