1.1 --- a/BitKeeper/etc/logging_ok	Mon Nov 10 13:44:15 2003 +0000
     1.2 +++ b/BitKeeper/etc/logging_ok	Mon Nov 10 16:36:15 2003 +0000
     1.3 @@ -6,6 +6,7 @@ akw27@labyrinth.cl.cam.ac.uk
     1.4  akw27@plucky.localdomain
     1.5  bd240@boulderdash.cl.cam.ac.uk
     1.6  bd240@labyrinth.cl.cam.ac.uk
     1.7 +br260@laudney.cl.cam.ac.uk
     1.8  iap10@freefall.cl.cam.ac.uk
     1.9  iap10@labyrinth.cl.cam.ac.uk
    1.10  iap10@striker.cl.cam.ac.uk

     2.1 --- a/xen/Makefile	Mon Nov 10 13:44:15 2003 +0000
     2.2 +++ b/xen/Makefile	Mon Nov 10 16:36:15 2003 +0000
     2.3 @@ -15,7 +15,7 @@ default: $(TARGET)
     2.4  	gzip -f -9 < $(TARGET) > $(TARGET).gz
     2.5  
     2.6  debug:	
     2.7 -	objdump -D -S image >image.s
     2.8 +	objdump -D -S $(TARGET) > $(TARGET).s
     2.9  
    2.10  install: $(TARGET)
    2.11  	gzip -f -9 < $(TARGET) > $(TARGET).gz
    2.12 @@ -76,5 +76,5 @@ TAGS:
    2.13  	find include -type d \( -name "asm-*" -o -name config \) -prune -o -name '*.h' -print | xargs etags -a
    2.14  	find $(SUBDIRS) -name '*.[ch]' | xargs etags -a
    2.15  MAP:
    2.16 -	nm image | grep -v '\(compiled\)\|\(\.o$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | sort > System.map
    2.17 +	nm $(TARGET) | grep -v '\(compiled\)\|\(\.o$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | sort > System.map
    2.18  

     3.1 --- a/xen/Rules.mk	Mon Nov 10 13:44:15 2003 +0000
     3.2 +++ b/xen/Rules.mk	Mon Nov 10 16:36:15 2003 +0000
     3.3 @@ -1,7 +1,6 @@
     3.4 -
     3.5  ARCH    := i386
     3.6  
     3.7 -TARGET  := $(BASEDIR)/image
     3.8 +TARGET  := $(BASEDIR)/xen
     3.9  HDRS    := $(wildcard $(BASEDIR)/include/xeno/*.h)
    3.10  HDRS    += $(wildcard $(BASEDIR)/include/scsi/*.h)
    3.11  HDRS    += $(wildcard $(BASEDIR)/include/hypervisor-ifs/*.h)

     4.1 --- a/xenolinux-2.4.22-sparse/arch/xeno/Makefile	Mon Nov 10 13:44:15 2003 +0000
     4.2 +++ b/xenolinux-2.4.22-sparse/arch/xeno/Makefile	Mon Nov 10 16:36:15 2003 +0000
     4.3 @@ -93,11 +93,11 @@ FORCE: ;
     4.4  .PHONY: bzImage compressed clean archclean archmrproper archdep
     4.5  
     4.6  bzImage: vmlinux
     4.7 -	@$(MAKEBOOT) image.gz
     4.8 +	@$(MAKEBOOT) xenolinux.gz
     4.9  
    4.10  install: bzImage
    4.11  	mkdir -p ../install/boot
    4.12 -	cp -a arch/$(ARCH)/boot/image.gz ../install/boot/xenolinux.gz
    4.13 +	cp -a arch/$(ARCH)/boot/xenolinux.gz ../install/boot/xenolinux.gz
    4.14  
    4.15  archclean:
    4.16  	@$(MAKEBOOT) clean

     5.1 --- a/xenolinux-2.4.22-sparse/arch/xeno/boot/Makefile	Mon Nov 10 13:44:15 2003 +0000
     5.2 +++ b/xenolinux-2.4.22-sparse/arch/xeno/boot/Makefile	Mon Nov 10 16:36:15 2003 +0000
     5.3 @@ -2,21 +2,21 @@
     5.4  # arch/xeno/boot/Makefile
     5.5  #
     5.6  
     5.7 -image.gz: image
     5.8 +xenolinux.gz: xenolinux
     5.9  	gzip -f -9 < $< > $@
    5.10  
    5.11 -image: $(TOPDIR)/vmlinux
    5.12 +xenolinux: $(TOPDIR)/vmlinux
    5.13  	# Guest OS header -- first 8 bytes are identifier 'XenoGues'.
    5.14  	echo -e -n 'XenoGues' >$@ 
    5.15  	# Guest OS header -- next 4 bytes are load address (0xC0000000).
    5.16  	echo -e -n '\000\000\000\300' >>$@
    5.17 -	$(OBJCOPY) $< image.body
    5.18 +	$(OBJCOPY) $< xenolinux.body
    5.19  	# Guest OS header is immediately followed by raw OS image.
    5.20  	# Start address must be at byte 0.
    5.21 -	cat image.body >>$@
    5.22 -	rm -f image.body
    5.23 +	cat xenolinux.body >>$@
    5.24 +	rm -f xenolinux.body
    5.25  
    5.26  dep:
    5.27  
    5.28  clean:
    5.29 -	rm -f image image.gz
    5.30 +	rm -f xenolinux xenolinux.gz
    5.31 \ No newline at end of file