ia64/xen-unstable

changeset 4111:a0be5e5a1f37

bitkeeper revision 1.1159.258.51 (42332e7fgmGVTCY4Es7dEft7_Ne7MQ)

Merge freefall.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into freefall.cl.cam.ac.uk:/auto/groups/xeno/users/iap10/xeno-clone/xen-2.0-testing.bk
author iap10@freefall.cl.cam.ac.uk
date Sat Mar 12 18:01:35 2005 +0000 (2005-03-12)
parents 025b0ae7bbee 0865d1223c52
children 62fcb87e60f6
files BitKeeper/etc/logging_ok Makefile docs/Makefile docs/check_pkgs tools/Makefile tools/examples/Makefile tools/examples/init.d/xend tools/examples/init.d/xendomains tools/libxc/Makefile tools/libxutil/Makefile tools/misc/Makefile tools/python/Makefile tools/xentrace/Makefile tools/xfrd/Makefile xen/Makefile
line diff
     1.1 --- a/BitKeeper/etc/logging_ok	Fri Mar 11 14:55:06 2005 +0000
     1.2 +++ b/BitKeeper/etc/logging_ok	Sat Mar 12 18:01:35 2005 +0000
     1.3 @@ -16,6 +16,7 @@ cl349@freefall.cl.cam.ac.uk
     1.4  cl349@labyrinth.cl.cam.ac.uk
     1.5  cwc22@centipede.cl.cam.ac.uk
     1.6  djm@kirby.fc.hp.com
     1.7 +doogie@brainfood.com
     1.8  gm281@boulderdash.cl.cam.ac.uk
     1.9  gm281@tetrapod.cl.cam.ac.uk
    1.10  iap10@freefall.cl.cam.ac.uk
     2.1 --- a/Makefile	Fri Mar 11 14:55:06 2005 +0000
     2.2 +++ b/Makefile	Sat Mar 12 18:01:35 2005 +0000
     2.3 @@ -37,6 +37,11 @@ all: dist
     2.4  # build and install everything into the standard system directories
     2.5  install: install-xen install-tools install-kernels install-docs
     2.6  
     2.7 +build: kernels
     2.8 +	$(MAKE) -C xen build
     2.9 +	$(MAKE) -C tools build
    2.10 +	$(MAKE) -C docs build
    2.11 +
    2.12  # build and install everything into local dist directory
    2.13  dist: xen tools kernels docs
    2.14  	$(INSTALL_DIR) $(DISTDIR)/check
     3.1 --- a/docs/Makefile	Fri Mar 11 14:55:06 2005 +0000
     3.2 +++ b/docs/Makefile	Sat Mar 12 18:01:35 2005 +0000
     3.3 @@ -18,14 +18,17 @@ DOC_HTML	:= $(patsubst src/%.tex,html/%/
     3.4  
     3.5  GFX = $(patsubst %.fig, %.eps, $(wildcard figs/*.fig))
     3.6  
     3.7 -all: ps pdf html
     3.8 +all: build
     3.9 +build: ps pdf html
    3.10  	rm -f *.aux *.dvi *.bbl *.blg *.glo *.idx *.ilg *.log *.ind *.toc
    3.11  
    3.12  ps: $(DOC_PS)
    3.13  
    3.14  pdf: $(DOC_PDF)
    3.15  
    3.16 -html: $(DOC_HTML)
    3.17 +html:
    3.18 +	@if which $(LATEX2HTML) 1>/dev/null 2>/dev/null; then \
    3.19 +	$(MAKE) $(DOC_HTML); fi
    3.20  
    3.21  clean:
    3.22  	rm -rf .word_count *.aux *.dvi *.bbl *.blg *.glo *.idx *~ 
    3.23 @@ -37,7 +40,7 @@ install: all
    3.24  	$(INSTALL_DIR) $(DESTDIR)$(pkgdocdir)
    3.25  	cp -dR ps $(DESTDIR)$(pkgdocdir)
    3.26  	cp -dR pdf $(DESTDIR)$(pkgdocdir)
    3.27 -	cp -dR html $(DESTDIR)$(pkgdocdir)
    3.28 +	[ ! -d html ] || cp -dR html $(DESTDIR)$(pkgdocdir)
    3.29  
    3.30  pdf/%.pdf: ps/%.ps
    3.31  	$(INSTALL_DIR) $(@D)
     4.1 --- a/docs/check_pkgs	Fri Mar 11 14:55:06 2005 +0000
     4.2 +++ b/docs/check_pkgs	Sat Mar 12 18:01:35 2005 +0000
     4.3 @@ -13,7 +13,6 @@ silent_which ()
     4.4  }
     4.5  
     4.6  silent_which latex      || exit 1
     4.7 -silent_which latex2html || exit 1
     4.8  silent_which dvips      || exit 1
     4.9  silent_which ps2pdf     || exit 1
    4.10  silent_which fig2dev    || exit 1
     5.1 --- a/tools/Makefile	Fri Mar 11 14:55:06 2005 +0000
     5.2 +++ b/tools/Makefile	Sat Mar 12 18:01:35 2005 +0000
     5.3 @@ -20,13 +20,13 @@ install:
     5.4  	$(MAKE) -C xfrd install
     5.5  	$(MAKE) -C sv install
     5.6  
     5.7 -clean:
     5.8 -	$(MAKE) -C check clean
     5.9 -	$(MAKE) -C libxutil clean
    5.10 -	$(MAKE) -C libxc clean
    5.11 -	$(MAKE) -C misc clean
    5.12 -	$(MAKE) -C examples clean
    5.13 -	$(MAKE) -C xentrace clean
    5.14 -	$(MAKE) -C python clean
    5.15 -	$(MAKE) -C xfrd clean
    5.16 +clean build:
    5.17 +	$(MAKE) -C check $@
    5.18 +	$(MAKE) -C libxutil $@
    5.19 +	$(MAKE) -C libxc $@
    5.20 +	$(MAKE) -C misc $@
    5.21 +	$(MAKE) -C examples $@
    5.22 +	$(MAKE) -C xentrace $@
    5.23 +	$(MAKE) -C python $@
    5.24 +	$(MAKE) -C xfrd $@
    5.25  
     6.1 --- a/tools/examples/Makefile	Fri Mar 11 14:55:06 2005 +0000
     6.2 +++ b/tools/examples/Makefile	Sat Mar 12 18:01:35 2005 +0000
     6.3 @@ -21,6 +21,7 @@ XEN_SCRIPTS += block-file
     6.4  XEN_SCRIPTS += block-enbd
     6.5  
     6.6  all: 
     6.7 +build:
     6.8  
     6.9  install: all install-initd install-configs install-scripts
    6.10  
     7.1 --- a/tools/examples/init.d/xend	Fri Mar 11 14:55:06 2005 +0000
     7.2 +++ b/tools/examples/init.d/xend	Sat Mar 12 18:01:35 2005 +0000
     7.3 @@ -7,6 +7,10 @@
     7.4  # chkconfig: 2345 98 01
     7.5  # description: Starts and stops the Xen control daemon.
     7.6  
     7.7 +if ! [ -e /proc/xen/privcmd ]; then
     7.8 +	exit 0
     7.9 +fi
    7.10 +
    7.11  # Wait for Xend / Xfrd to be up
    7.12  function await_daemons_up
    7.13  {
     8.1 --- a/tools/examples/init.d/xendomains	Fri Mar 11 14:55:06 2005 +0000
     8.2 +++ b/tools/examples/init.d/xendomains	Sat Mar 12 18:01:35 2005 +0000
     8.3 @@ -15,6 +15,10 @@
     8.4  # <http://www.tldp.org/HOWTO/HighQuality-Apps-HOWTO/>
     8.5  #
     8.6  
     8.7 +if ! [ -e /proc/xen/privcmd ]; then
     8.8 +	exit 0
     8.9 +fi
    8.10 +
    8.11  RETVAL=0
    8.12  
    8.13  INITD=/etc/init.d
     9.1 --- a/tools/libxc/Makefile	Fri Mar 11 14:55:06 2005 +0000
     9.2 +++ b/tools/libxc/Makefile	Sat Mar 12 18:01:35 2005 +0000
     9.3 @@ -44,7 +44,8 @@ PIC_OBJS := $(patsubst %.c,%.opic,$(SRCS
     9.4  
     9.5  LIB      := libxc.a libxc.so libxc.so.$(MAJOR) libxc.so.$(MAJOR).$(MINOR)
     9.6  
     9.7 -all: check-for-zlib mk-symlinks
     9.8 +all: build
     9.9 +build: check-for-zlib mk-symlinks
    9.10  	$(MAKE) $(LIB)
    9.11  
    9.12  check-for-zlib:
    9.13 @@ -66,7 +67,7 @@ mk-symlinks:
    9.14  	( cd xen/linux >/dev/null ; \
    9.15  	  ln -sf ../../$(LINUX_ROOT)/include/asm-xen/linux-public/*.h . )
    9.16  
    9.17 -install: all
    9.18 +install: build
    9.19  	[ -d $(DESTDIR)/usr/lib ] || $(INSTALL_DIR) $(DESTDIR)/usr/lib
    9.20  	[ -d $(DESTDIR)/usr/include ] || $(INSTALL_DIR) $(DESTDIR)/usr/include
    9.21  	$(INSTALL_PROG) libxc.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/lib
    9.22 @@ -78,7 +79,7 @@ install: all
    9.23  clean:
    9.24  	rm -rf *.a *.so* *.o *.opic *.rpm $(LIB) *~ $(DEPS) xen
    9.25  
    9.26 -rpm: all
    9.27 +rpm: build
    9.28  	rm -rf staging
    9.29  	mkdir staging
    9.30  	mkdir staging/i386
    10.1 --- a/tools/libxutil/Makefile	Fri Mar 11 14:55:06 2005 +0000
    10.2 +++ b/tools/libxutil/Makefile	Sat Mar 12 18:01:35 2005 +0000
    10.3 @@ -40,7 +40,8 @@ LIB      += libxutil.so.$(MAJOR)
    10.4  LIB      += libxutil.so.$(MAJOR).$(MINOR)
    10.5  LIB      += libxutil.a
    10.6  
    10.7 -all: check-for-zlib
    10.8 +all: build
    10.9 +build: check-for-zlib
   10.10  	$(MAKE) $(LIB)
   10.11  
   10.12  libxutil.so: libxutil.so.$(MAJOR)
   10.13 @@ -63,7 +64,7 @@ check-for-zlib:
   10.14  	false; \
   10.15  	fi
   10.16  
   10.17 -install: all
   10.18 +install: build
   10.19  	[ -d $(DESTDIR)/usr/lib ] || $(INSTALL_DIR) -p $(DESTDIR)/usr/lib
   10.20  	$(INSTALL_PROG) libxutil.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/lib
   10.21  	$(INSTALL_DATA) libxutil.a $(DESTDIR)/usr/lib
    11.1 --- a/tools/misc/Makefile	Fri Mar 11 14:55:06 2005 +0000
    11.2 +++ b/tools/misc/Makefile	Sat Mar 12 18:01:35 2005 +0000
    11.3 @@ -19,10 +19,11 @@ TARGETS  = xenperf
    11.4  INSTALL_BIN  = $(TARGETS) xencons
    11.5  INSTALL_SBIN = netfix xm xend xensv xenperf
    11.6  
    11.7 -all: $(TARGETS)
    11.8 +all: build
    11.9 +build: $(TARGETS)
   11.10  	$(MAKE) -C miniterm
   11.11  
   11.12 -install: all
   11.13 +install: build
   11.14  	[ -d $(DESTDIR)/usr/bin ] || $(INSTALL_DIR) $(DESTDIR)/usr/bin
   11.15  	[ -d $(DESTDIR)/usr/sbin ] || $(INSTALL_DIR) $(DESTDIR)/usr/sbin
   11.16  	$(INSTALL_PROG) $(INSTALL_BIN) $(DESTDIR)/usr/bin
    12.1 --- a/tools/python/Makefile	Fri Mar 11 14:55:06 2005 +0000
    12.2 +++ b/tools/python/Makefile	Sat Mar 12 18:01:35 2005 +0000
    12.3 @@ -2,11 +2,17 @@
    12.4  XEN_ROOT = ../..
    12.5  include $(XEN_ROOT)/tools/Rules.mk
    12.6  
    12.7 -all:
    12.8 +all: build
    12.9 +build:
   12.10  	CFLAGS="$(CFLAGS)" python setup.py build
   12.11  
   12.12 +ifndef XEN_PYTHON_NATIVE_INSTALL
   12.13  install: all
   12.14  	CFLAGS="$(CFLAGS)" python setup.py install --home="$(DESTDIR)/usr"
   12.15 +else
   12.16 +install: all
   12.17 +	CFLAGS="$(CFLAGS)" python setup.py install --root="$(DESTDIR)"
   12.18 +endif
   12.19  
   12.20  clean:
   12.21  	rm -rf build *.pyc *.pyo *.o *.a *~
    13.1 --- a/tools/xentrace/Makefile	Fri Mar 11 14:55:06 2005 +0000
    13.2 +++ b/tools/xentrace/Makefile	Sat Mar 12 18:01:35 2005 +0000
    13.3 @@ -21,9 +21,10 @@ SCRIPTS  = xentrace_format
    13.4  MAN1     = $(wildcard *.1)
    13.5  MAN8     = $(wildcard *.8)
    13.6  
    13.7 -all: $(BIN)
    13.8 +all: build
    13.9 +build: $(BIN)
   13.10  
   13.11 -install: all
   13.12 +install: build
   13.13  	[ -d $(DESTDIR)/usr/bin ] || $(INSTALL_DIR) $(DESTDIR)/usr/bin
   13.14  	[ -d $(DESTDIR)/usr/man/man1 ] || \
   13.15  		$(INSTALL_DIR) $(DESTDIR)/usr/man/man1
    14.1 --- a/tools/xfrd/Makefile	Fri Mar 11 14:55:06 2005 +0000
    14.2 +++ b/tools/xfrd/Makefile	Sat Mar 12 18:01:35 2005 +0000
    14.3 @@ -63,7 +63,8 @@ XFRD_LIBS += $(CURL_LIBS)
    14.4  
    14.5  #$(warning XFRD_LIBS = $(XFRD_LIBS))
    14.6  
    14.7 -all: xfrd
    14.8 +all: build
    14.9 +build: xfrd
   14.10  
   14.11  xfrd: $(XFRD_PROG_OBJ)
   14.12  	$(CC) -o $@ $^ $(XFRD_LIBS)
    15.1 --- a/xen/Makefile	Fri Mar 11 14:55:06 2005 +0000
    15.2 +++ b/xen/Makefile	Sat Mar 12 18:01:35 2005 +0000
    15.3 @@ -16,7 +16,7 @@ export BASEDIR          := $(CURDIR)
    15.4  
    15.5  include Rules.mk
    15.6  
    15.7 -default: $(TARGET).gz
    15.8 +default: build
    15.9  $(TARGET).gz: $(TARGET)
   15.10  	gzip -f -9 < $< > $@.new
   15.11  	mv $@.new $@
   15.12 @@ -24,9 +24,10 @@ default: $(TARGET).gz
   15.13  debug:	
   15.14  	objdump -D -S $(TARGET)-syms > $(TARGET).s
   15.15  
   15.16 -dist:
   15.17 -	$(MAKE) install
   15.18 +dist: install
   15.19  
   15.20 +build: $(TARGET).gz
   15.21 +	
   15.22  install: $(TARGET).gz
   15.23  	[ -d $(DESTDIR)/boot ] || $(INSTALL_DIR) $(DESTDIR)/boot
   15.24  	$(INSTALL_DATA) $(TARGET).gz $(DESTDIR)/boot