ia64/xen-unstable

changeset 3525:e90c7778ab94

bitkeeper revision 1.1159.212.37 (41f6442d0VIx4x9hYxFJgoaH6RGtRg)

Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
author kaf24@scramble.cl.cam.ac.uk
date Tue Jan 25 13:05:49 2005 +0000 (2005-01-25)
parents 2cf794f4d28c 5d73739fd212
children 51052c8b6456
files .rootkeys BitKeeper/etc/ignore xen/Makefile xen/include/xen/banner.h
line diff
     1.1 --- a/.rootkeys	Tue Jan 25 02:44:14 2005 +0000
     1.2 +++ b/.rootkeys	Tue Jan 25 13:05:49 2005 +0000
     1.3 @@ -1059,7 +1059,6 @@ 404f3d2eR2Owk-ZcGOx9ULGHg3nrww xen/inclu
     1.4  3ddb79c25UE59iu4JJcbRalx95mvcg xen/include/public/xen.h
     1.5  3e397e66m2tO3s-J8Jnr7Ws_tGoPTg xen/include/xen/ac_timer.h
     1.6  40715b2epYl2jBbxzz9CI2rgIca7Zg xen/include/xen/acpi.h
     1.7 -41f2cea7ZvnB9JC4qkiq1K8H7xJw5Q xen/include/xen/banner.h
     1.8  3ddb79c0c0cX_DZE209-Bb-Rx1v-Aw xen/include/xen/cache.h
     1.9  41f2cea7Yna7xc0X9fyavIjoSFFeVg xen/include/xen/compile.h.in
    1.10  3f840f12CkbYSlwMrY2S11Mpyxg7Nw xen/include/xen/compiler.h
     2.1 --- a/BitKeeper/etc/ignore	Tue Jan 25 02:44:14 2005 +0000
     2.2 +++ b/BitKeeper/etc/ignore	Tue Jan 25 13:05:49 2005 +0000
     2.3 @@ -91,6 +91,8 @@ xen/figlet/figlet
     2.4  xen/include/asm
     2.5  xen/include/asm-*/asm-offsets.h
     2.6  xen/include/hypervisor-ifs/arch
     2.7 +xen/include/xen/*.new
     2.8 +xen/include/xen/banner.h
     2.9  xen/include/xen/compile.h
    2.10  xen/tools/elf-reloc
    2.11  xen/tools/figlet/figlet
     3.1 --- a/xen/Makefile	Tue Jan 25 02:44:14 2005 +0000
     3.2 +++ b/xen/Makefile	Tue Jan 25 13:05:49 2005 +0000
     3.3 @@ -51,12 +51,12 @@ clean:
     3.4  
     3.5  # Blow away kernel.o because build info is stored statically within it.
     3.6  delete-unfresh-files:
     3.7 -	rm -f include/xen/compile.h common/kernel.o
     3.8 +	rm -f include/xen/banner.h include/xen/compile.h common/kernel.o
     3.9  
    3.10  # compile.h contains dynamic build info. Rebuilt on every 'make' invocation.
    3.11  include/xen/compile.h: LANG=C
    3.12  include/xen/compile.h: include/xen/compile.h.in include/xen/banner.h
    3.13 -	sed -e 's/@@date@@/$(shell date)/g' \
    3.14 +	@sed -e 's/@@date@@/$(shell date)/g' \
    3.15  	    -e 's/@@time@@/$(shell date +%T)/g' \
    3.16  	    -e 's/@@whoami@@/$(shell whoami)/g' \
    3.17  	    -e 's/@@domain@@/$(shell ([ -x /bin/dnsdomainname ] && /bin/dnsdomainname) || ([ -x /bin/domainname ] && /bin/domainname || echo [unknown]))/g' \
    3.18 @@ -67,8 +67,8 @@ include/xen/compile.h: include/xen/compi
    3.19  	    -e 's/@@extraversion@@/$(XEN_EXTRAVERSION)/g' \
    3.20  	    -e 's!@@changeset@@!$(shell bk changes -nd':D: :T: :REV: :MD5KEY:' -r+ 2>/dev/null || echo information unavailable)!g' \
    3.21  	    < include/xen/compile.h.in > $@.new
    3.22 -	cat include/xen/banner.h >> $@.new
    3.23 -	mv -f $@.new $@
    3.24 +	@cat include/xen/banner.h >> $@.new
    3.25 +	@mv -f $@.new $@
    3.26  
    3.27  tools/figlet/figlet: tools/figlet/figlet.o
    3.28  	$(CC) -o $@ $<
    3.29 @@ -77,7 +77,7 @@ tools/figlet/figlet.o: tools/figlet/figl
    3.30  
    3.31  include/xen/banner.h: tools/figlet/figlet tools/figlet/xen.flf
    3.32  	tools/figlet/figlet -d tools/figlet Xen $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) > $@.new
    3.33 -	mv -f $@.new $@
    3.34 +	@mv -f $@.new $@
    3.35  
    3.36  include/asm-$(TARGET_ARCH)/asm-offsets.h: arch/$(TARGET_ARCH)/asm-offsets.s
    3.37  	@(set -e; \
     4.1 --- a/xen/include/xen/banner.h	Tue Jan 25 02:44:14 2005 +0000
     4.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.3 @@ -1,12 +0,0 @@
     4.4 -"\040\137\137\040\040\137\137\040\040\040\040\040\040\040\040\040\040\040" \
     4.5 -"\040\137\137\137\137\040\040\040\040\137\137\137\040\040\012\040\134\040" \
     4.6 -"\134\057\040\057\137\137\137\040\137\040\137\137\040\040\040\174\137\137" \
     4.7 -"\137\040\134\040\040\057\040\137\040\134\040\012\040\040\134\040\040\057" \
     4.8 -"\057\040\137\040\134\040\047\137\040\134\040\040\040\040\137\137\051\040" \
     4.9 -"\174\174\040\174\040\174\040\174\012\040\040\057\040\040\134\040\040\137" \
    4.10 -"\137\057\040\174\040\174\040\174\040\040\057\040\137\137\057\040\174\040" \
    4.11 -"\174\137\174\040\174\012\040\057\137\057\134\137\134\137\137\137\174\137" \
    4.12 -"\174\040\174\137\174\040\174\137\137\137\137\137\050\137\051\137\137\137" \
    4.13 -"\057\040\012\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040" \
    4.14 -"\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\012" \
    4.15 -