ia64/xen-unstable

changeset 3133:6e367cf5eb0b

bitkeeper revision 1.1159.187.12 (41a5f5ffLANWdJeipO7JLMl8j-6O3Q)

Merge ssh://xenbk@gandalf.hpl.hp.com//var/bk/xen-2.0-testing.bk
into labyrinth.cl.cam.ac.uk:/auto/anfs/scratch/labyrinth/iap10/xeno-clone/xeno.bk
author iap10@labyrinth.cl.cam.ac.uk
date Thu Nov 25 15:10:55 2004 +0000 (2004-11-25)
parents f52ac722d9c7 aa143d62d43d
children 452731aa69b6 f92f84310af3
files tools/libxutil/sxpr_parser.c tools/vnet/Makefile tools/vnet/vnet-module/00README tools/vnet/vnet-module/Makefile tools/vnet/vnet-module/Makefile-2.4 tools/vnet/vnet-module/Makefile-2.6 tools/vnet/vnet-module/Makefile.ver
line diff
     1.1 --- a/tools/libxutil/sxpr_parser.c	Thu Nov 25 15:07:48 2004 +0000
     1.2 +++ b/tools/libxutil/sxpr_parser.c	Thu Nov 25 15:10:55 2004 +0000
     1.3 @@ -258,8 +258,9 @@ int Parser_pop(Parser *p){
     1.4      int err = 0;
     1.5      ParserState *s = p->state;
     1.6      p->state = s->parent;
     1.7 -    if (p->start_state == s)
     1.8 +    if (p->start_state == s) {
     1.9          p->start_state = NULL;
    1.10 +    }
    1.11      ParserState_free(s);
    1.12      return err;
    1.13  }
     2.1 --- a/tools/vnet/Makefile	Thu Nov 25 15:07:48 2004 +0000
     2.2 +++ b/tools/vnet/Makefile	Thu Nov 25 15:10:55 2004 +0000
     2.3 @@ -1,5 +1,13 @@
     2.4  
     2.5 -export LINUX_RELEASE ?=2.6
     2.6 +export LINUX_SERIES ?=2.6
     2.7 +
     2.8 +# Root path to install in.
     2.9 +# Set to '/' to install relative to filesystem root.
    2.10 +export prefix?=$(shell cd ../../dist/install && pwd)
    2.11 +
    2.12 +.PHONY: all compile
    2.13 +.PHONY: gc-install gc-clean gc-prstine
    2.14 +.PHONY: vnetd vnet-module install dist clean pristine
    2.15  
    2.16  all: compile
    2.17  
    2.18 @@ -12,8 +20,12 @@ gc: gc.tar.gz
    2.19  	tar xfz gc.tar.gz
    2.20  	ln -sf gc?.? gc
    2.21  
    2.22 -gc-install: gc
    2.23 -	(cd gc && ./configure --prefix=`pwd`/install && make && make install)
    2.24 +gc/Makefile:
    2.25 +	(cd gc && ./configure --prefix=`pwd`/install)
    2.26 +
    2.27 +gc-install: gc gc/Makefile
    2.28 +	make -C gc
    2.29 +	make -C gc install
    2.30  
    2.31  gc-clean:
    2.32  	-$(MAKE) -C gc clean
    2.33 @@ -21,8 +33,6 @@ gc-clean:
    2.34  gc-pristine:
    2.35  	-rm -rf gc?.? gc
    2.36  
    2.37 -.PHONY: vnetd vnet-module install dist clean
    2.38 -
    2.39  vnetd: gc-install
    2.40  	$(MAKE) -C vnetd
    2.41  
    2.42 @@ -35,8 +45,10 @@ install: compile
    2.43  	$(MAKE) -C examples install
    2.44  
    2.45  dist: $(TARGET)
    2.46 -	$(MAKE) prefix=`pwd`/../../install dist=yes install
    2.47 +	$(MAKE) install
    2.48  
    2.49  clean:
    2.50  	-$(MAKE) -C vnetd clean
    2.51  	-$(MAKE) -C vnet-module clean
    2.52 +
    2.53 +pristine: clean gc-pristine
     3.1 --- a/tools/vnet/vnet-module/00README	Thu Nov 25 15:07:48 2004 +0000
     3.2 +++ b/tools/vnet/vnet-module/00README	Thu Nov 25 15:10:55 2004 +0000
     3.3 @@ -6,36 +6,34 @@ The vnet module can be compiled for 2.4 
     3.4  The makefiles  use the following variables, which
     3.5  can be set in your env or on the make command line:
     3.6  
     3.7 -LINUX_RELEASE: linux release to compile for, 2.4 (default), or 2.6.
     3.8 -XENO_ROOT: root of the xen tree containing kernel source. Default '..'.
     3.9 -ROOT: root path to install in, default is XENO_ROOT/install.
    3.10 -      Set to '/' to install relative to filesystem root.
    3.11 -KERNEL_VERSION: kernel version, default got from XENO_ROOT.
    3.12 +LINUX_SERIES: linux release to compile for, 2.4 (default), or 2.6.
    3.13 +XEN_ROOT: root of the xen tree containing kernel source.
    3.14 +KERNEL_VERSION: kernel version, default got from XEN_ROOT.
    3.15  KERNEL_MINOR: kernel minor version, default -xen0.
    3.16 -KERNEL_SRC: path to kernel source, default linux-<VERSION> under XENO_ROOT.
    3.17 +KERNEL_SRC: path to kernel source, default linux-<VERSION> under XEN_ROOT.
    3.18  
    3.19  *) For 2.4 kernel
    3.20  
    3.21  To compile from scratch:
    3.22  
    3.23  make clean
    3.24 -make 
    3.25 +make LINUX_SERIES=2.4
    3.26  
    3.27  This will build vnet_module.o in the current directory.
    3.28  To install the module use
    3.29  
    3.30 -make install
    3.31 +make LINUX_SERIES=2.4 install
    3.32  
    3.33  *) For 2.6 kernel
    3.34  
    3.35  To compile from scratch:
    3.36  
    3.37  make clean
    3.38 -make LINUX_RELEASE=2.6
    3.39 +make
    3.40  
    3.41  This will build vnet_module.ko in the current directory.
    3.42  To install the module use
    3.43  
    3.44 -make LINUX_RELEASE=2.6 install
    3.45 +make install
    3.46  
    3.47  
     4.1 --- a/tools/vnet/vnet-module/Makefile	Thu Nov 25 15:07:48 2004 +0000
     4.2 +++ b/tools/vnet/vnet-module/Makefile	Thu Nov 25 15:10:55 2004 +0000
     4.3 @@ -20,9 +20,9 @@
     4.4  
     4.5  #============================================================================
     4.6  ifeq ($(src),)
     4.7 -LINUX_RELEASE ?=2.6
     4.8 +LINUX_SERIES ?=2.6
     4.9  
    4.10 -include Makefile-$(LINUX_RELEASE)
    4.11 +include Makefile-$(LINUX_SERIES)
    4.12  
    4.13  #============================================================================
    4.14  else
     5.1 --- a/tools/vnet/vnet-module/Makefile-2.4	Thu Nov 25 15:07:48 2004 +0000
     5.2 +++ b/tools/vnet/vnet-module/Makefile-2.4	Thu Nov 25 15:10:55 2004 +0000
     5.3 @@ -21,6 +21,7 @@
     5.4  #============================================================================
     5.5  # Vnet module makefile for 2.4 series kernels.
     5.6  
     5.7 +LINUX_SERIES ?=2.4
     5.8  include Makefile.ver
     5.9  
    5.10  KERNEL_MODULE := vnet_module.o
     6.1 --- a/tools/vnet/vnet-module/Makefile-2.6	Thu Nov 25 15:07:48 2004 +0000
     6.2 +++ b/tools/vnet/vnet-module/Makefile-2.6	Thu Nov 25 15:10:55 2004 +0000
     6.3 @@ -21,7 +21,7 @@
     6.4  #============================================================================
     6.5  # Vnet module makefile for 2.6 series kernels.
     6.6  
     6.7 -LINUX_RELEASE ?= 2.6
     6.8 +LINUX_SERIES ?=2.6
     6.9  include Makefile.ver
    6.10  
    6.11  KERNEL_MODULE = vnet_module.ko
     7.1 --- a/tools/vnet/vnet-module/Makefile.ver	Thu Nov 25 15:07:48 2004 +0000
     7.2 +++ b/tools/vnet/vnet-module/Makefile.ver	Thu Nov 25 15:10:55 2004 +0000
     7.3 @@ -29,14 +29,14 @@ XEN_ROOT ?=../../..
     7.4  prefix ?=$(XEN_ROOT)/install/
     7.5  #----------------------------------------------------------------------------
     7.6  
     7.7 -LINUX_RELEASE ?=2.6
     7.8 +LINUX_SERIES ?=2.6
     7.9  KERNEL_MINOR ?=-xen0
    7.10  
    7.11 -LINUX_VERSION ?= $(shell ( /bin/ls -ld $(XEN_ROOT)/linux-$(LINUX_RELEASE).*-xen-sparse ) 2>/dev/null | \
    7.12 +LINUX_VERSION ?= $(shell ( /bin/ls -ld $(XEN_ROOT)/linux-$(LINUX_SERIES).*-xen-sparse ) 2>/dev/null | \
    7.13                        sed -e 's!^.*linux-\(.\+\)-xen-sparse!\1!' )
    7.14  
    7.15  ifeq ($(LINUX_VERSION),)
    7.16 -$(error Kernel source for linux $(LINUX_RELEASE) not found)
    7.17 +$(error Kernel source for linux $(LINUX_SERIES) not found)
    7.18  endif
    7.19  
    7.20  KERNEL_VERSION =$(LINUX_VERSION)$(KERNEL_MINOR)