[PATCH 4/5] tools/include - Use real source files for xen/foreign build

[PATCH 4/5] tools/include - Use real source files for xen/foreign build

[Bastian Blank]

# HG changeset patch
# User Bastian Blank <waldi@debian.org>
# Date 1201355693 -3600
# Node ID 79162b6b2682aac42b145e20428ebf382db14579
# Parent  ead4852e6fa0c8899bde9235d3329c1772072cd3
Use real source files for xen/foreign build.

Signed-off-by: Bastian Blank <waldi@debian.org>

diff -r ead4852e6fa0 -r 79162b6b2682 tools/include/xen-foreign/Makefile
--- a/tools/include/xen-foreign/Makefile	Sat Jan 26 14:54:53 2008 +0100
+++ b/tools/include/xen-foreign/Makefile	Sat Jan 26 14:54:53 2008 +0100
@@ -1,14 +1,14 @@ XEN_ROOT=../../..
 XEN_ROOT=../../..
 include $(XEN_ROOT)/Config.mk
 
-ROOT = $(XEN_ROOT)/xen/include/public/foreign
-HOSTCFLAGS += -I$(ROOT)
+ROOT = $(XEN_ROOT)/xen/include/public
+HOSTCFLAGS += -I$(ROOT)/foreign
 
-MKHEADER_PY = $(ROOT)/mkheader.py
+MKCHECKER_PY = $(ROOT)/foreign/mkchecker.py
+MKHEADER_PY = $(ROOT)/foreign/mkheader.py
 
 architectures := x86_32 x86_64 ia64
 headers := $(patsubst %, %.h, $(architectures))
-scripts := $(wildcard *.py)
 
 .PHONY: all clean check-headers
 all: $(headers) check-headers
@@ -24,21 +24,21 @@ checker: checker.c $(headers)
 
 check-headers: checker
 	./checker > tmp.size
-	diff -u $(ROOT)/reference.size tmp.size
+	diff -u $(ROOT)/foreign/reference.size tmp.size
 	rm tmp.size
 else
 check-headers:
 	@echo "cross build: skipping check"
 endif
 
-x86_32.h: $(ROOT)/mkheader.py ../xen/arch-x86/xen-x86_32.h ../xen/arch-x86/xen.h ../xen/xen.h
+x86_32.h: $(MKHEADER_PY) $(ROOT)/arch-x86/xen-x86_32.h $(ROOT)/arch-x86/xen.h $(ROOT)/xen.h
 	python $< $* $@ $(filter %.h,$^)
 
-x86_64.h: $(ROOT)/mkheader.py ../xen/arch-x86/xen-x86_64.h ../xen/arch-x86/xen.h ../xen/xen.h
+x86_64.h: $(MKHEADER_PY) $(ROOT)/arch-x86/xen-x86_64.h $(ROOT)/arch-x86/xen.h $(ROOT)/xen.h
 	python $< $* $@ $(filter %.h,$^)
 
-ia64.h: $(ROOT)/mkheader.py ../xen/arch-ia64.h ../xen/xen.h
+ia64.h: $(MKHEADER_PY) $(ROOT)/arch-ia64.h $(ROOT)/xen.h
 	python $< $* $@ $(filter %.h,$^)
 
-checker.c: $(ROOT)/mkchecker.py
+checker.c: $(MKCHECKER_PY)
 	python $< $(XEN_TARGET_ARCH) $@ $(architectures)

Re: [PATCH 4/5] tools/include - Use real source files for xen/foreign build

[Keir Fraser]

On 26/1/08 14:04, "Bastian Blank" <bastian@waldi.eu.org> wrote:

> # HG changeset patch
> # User Bastian Blank <waldi@debian.org>
> # Date 1201355693 -3600
> # Node ID 79162b6b2682aac42b145e20428ebf382db14579
> # Parent  ead4852e6fa0c8899bde9235d3329c1772072cd3
> Use real source files for xen/foreign build.
> 
> Signed-off-by: Bastian Blank <waldi@debian.org>

Is there a particular reason we shouldn't go via the ../xen/ symlinks?

 -- Keir

Re: [PATCH 4/5] tools/include - Use real source files for xen/foreign build

[Keir Fraser]

On 26/1/08 14:11, "Keir Fraser" <Keir.Fraser@cl.cam.ac.uk> wrote:

>> Use real source files for xen/foreign build.
>> 
>> Signed-off-by: Bastian Blank <waldi@debian.org>
> 
> Is there a particular reason we shouldn't go via the ../xen/ symlinks?

Oh yes, I see patch 5/5 would break that since xen-foreign/ gets built in
parallel with xen/. Fair enough.

 -- Keir

Re: [PATCH 4/5] tools/include - Use real source files for xen/foreign build

[Bastian Blank]

On Sat, Jan 26, 2008 at 02:14:42PM +0000, Keir Fraser wrote:
> > Is there a particular reason we shouldn't go via the ../xen/ symlinks?
> Oh yes, I see patch 5/5 would break that since xen-foreign/ gets built in
> parallel with xen/. Fair enough.

Yes, the targets may run parallel. I have a patch now, which makes the
completely tools build run parallel. It just makes the output
unreadable.

Bastian

-- 
Schshschshchsch.
		-- The Gorn, "Arena", stardate 3046.2