bitkeeper revision 1.1236.25.10 (42335daeuY-j8gV61kHapguVRal9ig)

Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into firebug.cl.cam.ac.uk:/local/scratch/cl349/xen-unstable.bk-2.6.11

BitKeeper/etc/logging_ok

@@ -21,6 +21,7 @@ cl349@labyrinth.cl.cam.ac.uk
 cwc22@centipede.cl.cam.ac.uk
 cwc22@donkeykong.cl.cam.ac.uk
 djm@kirby.fc.hp.com
+doogie@brainfood.com
 gm281@boulderdash.cl.cam.ac.uk
 gm281@tetrapod.cl.cam.ac.uk
 harry@dory.(none)

Makefile

@@ -37,6 +37,11 @@ all: dist
 # build and install everything into the standard system directories
 install: install-xen install-tools install-kernels install-docs
 
+build: kernels
+	$(MAKE) -C xen build
+	$(MAKE) -C tools build
+	$(MAKE) -C docs build
+
 # build and install everything into local dist directory
 dist: xen tools kernels docs
 	$(INSTALL_DIR) $(DISTDIR)/check

docs/Makefile

@@ -18,14 +18,17 @@ DOC_HTML	:= $(patsubst src/%.tex,html/%/index.html,$(DOC_TEX))
 
 GFX = $(patsubst %.fig, %.eps, $(wildcard figs/*.fig))
 
-all: ps pdf html
+all: build
+build: ps pdf html
 	rm -f *.aux *.dvi *.bbl *.blg *.glo *.idx *.ilg *.log *.ind *.toc
 
 ps: $(DOC_PS)
 
 pdf: $(DOC_PDF)
 
-html: $(DOC_HTML)
+html:
+	@if which $(LATEX2HTML) 1>/dev/null 2>/dev/null; then \
+	$(MAKE) $(DOC_HTML); fi
 
 clean:
 	rm -rf .word_count *.aux *.dvi *.bbl *.blg *.glo *.idx *~ 
@@ -37,7 +40,7 @@ install: all
 	$(INSTALL_DIR) $(DESTDIR)$(pkgdocdir)
 	cp -dR ps $(DESTDIR)$(pkgdocdir)
 	cp -dR pdf $(DESTDIR)$(pkgdocdir)
-	cp -dR html $(DESTDIR)$(pkgdocdir)
+	[ ! -d html ] || cp -dR html $(DESTDIR)$(pkgdocdir)
 
 pdf/%.pdf: ps/%.ps
 	$(INSTALL_DIR) $(@D)

docs/check_pkgs

@@ -13,7 +13,6 @@ silent_which ()
 }
 
 silent_which latex      || exit 1
-silent_which latex2html || exit 1
 silent_which dvips      || exit 1
 silent_which ps2pdf     || exit 1
 silent_which fig2dev    || exit 1

tools/Makefile

@@ -24,14 +24,14 @@ install:
 	$(MAKE) -C xcs install
 	$(MAKE) -C ioemu install
 
-clean:
-	$(MAKE) -C check clean
-	$(MAKE) -C libxutil clean
-	$(MAKE) -C libxc clean
-	$(MAKE) -C misc clean
-	$(MAKE) -C examples clean
-	$(MAKE) -C xentrace clean
-	$(MAKE) -C python clean
-	$(MAKE) -C xfrd clean
+clean build:
+	$(MAKE) -C check $@
+	$(MAKE) -C libxutil $@
+	$(MAKE) -C libxc $@
+	$(MAKE) -C misc $@
+	$(MAKE) -C examples $@
+	$(MAKE) -C xentrace $@
+	$(MAKE) -C python $@
+	$(MAKE) -C xfrd $@
 	$(MAKE) -C xcs clean
 	$(MAKE) -C ioemu clean

tools/examples/Makefile

@@ -24,6 +24,7 @@ XEN_SCRIPTS += block-file
 XEN_SCRIPTS += block-enbd
 
 all: 
+build:
 
 install: all install-initd install-configs install-scripts
 

tools/examples/init.d/xend

@@ -7,6 +7,10 @@
 # chkconfig: 2345 98 01
 # description: Starts and stops the Xen control daemon.
 
+if ! [ -e /proc/xen/privcmd ]; then
+	exit 0
+fi
+
 # Wait for Xend / Xfrd to be up
 function await_daemons_up
 {

tools/examples/init.d/xendomains

@@ -15,6 +15,10 @@
 # <http://www.tldp.org/HOWTO/HighQuality-Apps-HOWTO/>
 #
 
+if ! [ -e /proc/xen/privcmd ]; then
+	exit 0
+fi
+
 RETVAL=0
 
 INITD=/etc/init.d

tools/libxc/Makefile

@@ -46,7 +46,8 @@ PIC_OBJS := $(patsubst %.c,%.opic,$(SRCS))
 
 LIB      := libxc.a libxc.so libxc.so.$(MAJOR) libxc.so.$(MAJOR).$(MINOR)
 
-all: check-for-zlib mk-symlinks
+all: build
+build: check-for-zlib mk-symlinks
 	$(MAKE) $(LIB)
 
 check-for-zlib:
@@ -68,7 +69,7 @@ mk-symlinks:
 	( cd xen/linux >/dev/null ; \
 	  ln -sf ../../$(LINUX_ROOT)/include/asm-xen/linux-public/*.h . )
 
-install: all
+install: build
 	[ -d $(DESTDIR)/usr/lib ] || $(INSTALL_DIR) $(DESTDIR)/usr/lib
 	[ -d $(DESTDIR)/usr/include ] || $(INSTALL_DIR) $(DESTDIR)/usr/include
 	$(INSTALL_PROG) libxc.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/lib
@@ -85,7 +86,7 @@ TAGS:
 clean:
 	rm -rf *.a *.so* *.o *.opic *.rpm $(LIB) *~ $(DEPS) xen
 
-rpm: all
+rpm: build
 	rm -rf staging
 	mkdir staging
 	mkdir staging/i386

tools/libxutil/Makefile

@@ -40,7 +40,8 @@ LIB      += libxutil.so.$(MAJOR)
 LIB      += libxutil.so.$(MAJOR).$(MINOR)
 LIB      += libxutil.a
 
-all: check-for-zlib
+all: build
+build: check-for-zlib
 	$(MAKE) $(LIB)
 
 libxutil.so: libxutil.so.$(MAJOR)
@@ -63,7 +64,7 @@ check-for-zlib:
 	false; \
 	fi
 
-install: all
+install: build
 	[ -d $(DESTDIR)/usr/lib ] || $(INSTALL_DIR) -p $(DESTDIR)/usr/lib
 	$(INSTALL_PROG) libxutil.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/lib
 	$(INSTALL_DATA) libxutil.a $(DESTDIR)/usr/lib

tools/misc/Makefile

@@ -19,10 +19,11 @@ TARGETS  = xenperf
 INSTALL_BIN  = $(TARGETS) xencons
 INSTALL_SBIN = netfix xm xend xensv xenperf
 
-all: $(TARGETS)
+all: build
+build: $(TARGETS)
 	$(MAKE) -C miniterm
 
-install: all
+install: build
 	[ -d $(DESTDIR)/usr/bin ] || $(INSTALL_DIR) $(DESTDIR)/usr/bin
 	[ -d $(DESTDIR)/usr/sbin ] || $(INSTALL_DIR) $(DESTDIR)/usr/sbin
 	$(INSTALL_PROG) $(INSTALL_BIN) $(DESTDIR)/usr/bin

tools/python/Makefile

@@ -2,11 +2,17 @@
 XEN_ROOT = ../..
 include $(XEN_ROOT)/tools/Rules.mk
 
-all:
+all: build
+build:
 	CFLAGS="$(CFLAGS)" python setup.py build
 
+ifndef XEN_PYTHON_NATIVE_INSTALL
 install: all
 	CFLAGS="$(CFLAGS)" python setup.py install --home="$(DESTDIR)/usr"
+else
+install: all
+	CFLAGS="$(CFLAGS)" python setup.py install --root="$(DESTDIR)"
+endif
 
 clean:
 	rm -rf build *.pyc *.pyo *.o *.a *~

tools/xentrace/Makefile

@@ -21,9 +21,10 @@ SCRIPTS  = xentrace_format
 MAN1     = $(wildcard *.1)
 MAN8     = $(wildcard *.8)
 
-all: $(BIN)
+all: build
+build: $(BIN)
 
-install: all
+install: build
 	[ -d $(DESTDIR)/usr/bin ] || $(INSTALL_DIR) $(DESTDIR)/usr/bin
 	[ -d $(DESTDIR)/usr/man/man1 ] || \
 		$(INSTALL_DIR) $(DESTDIR)/usr/man/man1

tools/xfrd/Makefile

@@ -63,7 +63,8 @@ XFRD_LIBS += $(CURL_LIBS)
 
 #$(warning XFRD_LIBS = $(XFRD_LIBS))
 
-all: xfrd
+all: build
+build: xfrd
 
 xfrd: $(XFRD_PROG_OBJ)
 	$(CC) -o $@ $^ $(XFRD_LIBS)

xen/Makefile

@@ -16,7 +16,7 @@ export BASEDIR          := $(CURDIR)
 
 include Rules.mk
 
-default: $(TARGET).gz
+default: build
 $(TARGET).gz: $(TARGET)
 	gzip -f -9 < $< > $@.new
 	mv $@.new $@
@@ -24,9 +24,10 @@ $(TARGET).gz: $(TARGET)
 debug:	
 	objdump -D -S $(TARGET)-syms > $(TARGET).s
 
-dist:
-	$(MAKE) install
+dist: install
 
+build: $(TARGET).gz
+	
 install: $(TARGET).gz
 	[ -d $(DESTDIR)/boot ] || $(INSTALL_DIR) $(DESTDIR)/boot
 	$(INSTALL_DATA) $(TARGET).gz $(DESTDIR)/boot