2007-05-03 04:54:49

by Tony Breeds

Subject: [LGUEST] Look in object dir for .config

From: Tony Breeds <[email protected]>

[LGUEST] Look in object dir for .config

If you build with make O=.... then .config isn't in ../../, this patch
goes partway to making sure that you don't dirty the source tree.

Signed-off-by: Tony Breeds <[email protected]>

---
Documentation/lguest/Makefile | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)

--- Documentation/lguest/Makefile.orig 2007-05-03 14:23:07.000000000 +1000
+++ Documentation/lguest/Makefile 2007-05-03 14:25:27.000000000 +1000
@@ -1,8 +1,15 @@
# This creates the demonstration utility "lguest" which runs a Linux guest.

+# For those people that have a separate object dir, look there for .config
+KBUILD_OUTPUT := ../..
+ifdef O
+ ifeq ("$(origin O)", "command line")
+ KBUILD_OUTPUT := $(O)
+ endif
+endif
# We rely on CONFIG_PAGE_OFFSET to know the highest address we can put
# the lguest binary.
-include ../../.config
+include $(KBUILD_OUTPUT)/.config
LGUEST_GUEST_TOP := ($(CONFIG_PAGE_OFFSET) - 0x08000000)

CFLAGS:=-Wall -Wmissing-declarations -Wmissing-prototypes -O3 \

Yours Tony

linux.conf.au http://linux.conf.au/ || http://lca2008.linux.org.au/
Jan 28 - Feb 02 2008 The Australian Linux Technical Conference!

2007-05-03 11:49:23

by Rusty Russell

Subject: Re: [LGUEST] Look in object dir for .config

On Thu, 2007-05-03 at 14:54 +1000, Tony Breeds wrote:
> From: Tony Breeds <[email protected]>
>
> [LGUEST] Look in object dir for .config
>
> If you build with make O=.... then .config isn't in ../../, this patch
> goes partway to making sure that you don't dirty the source tree.
>
> Signed-off-by: Tony Breeds <[email protected]>

Thanks Tony. Will forward to Andrew.

Cheers,
Rusty.