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

.rootkeys

@@ -1059,7 +1059,6 @@
 3ddb79c25UE59iu4JJcbRalx95mvcg xen/include/public/xen.h
 3e397e66m2tO3s-J8Jnr7Ws_tGoPTg xen/include/xen/ac_timer.h
 40715b2epYl2jBbxzz9CI2rgIca7Zg xen/include/xen/acpi.h
-41f2cea7ZvnB9JC4qkiq1K8H7xJw5Q xen/include/xen/banner.h
 3ddb79c0c0cX_DZE209-Bb-Rx1v-Aw xen/include/xen/cache.h
 41f2cea7Yna7xc0X9fyavIjoSFFeVg xen/include/xen/compile.h.in
 3f840f12CkbYSlwMrY2S11Mpyxg7Nw xen/include/xen/compiler.h

BitKeeper/etc/ignore

@@ -91,6 +91,8 @@ xen/figlet/figlet
 xen/include/asm
 xen/include/asm-*/asm-offsets.h
 xen/include/hypervisor-ifs/arch
+xen/include/xen/*.new
+xen/include/xen/banner.h
 xen/include/xen/compile.h
 xen/tools/elf-reloc
 xen/tools/figlet/figlet

xen/Makefile

@@ -51,12 +51,12 @@ $(TARGET): delete-unfresh-files include/xen/compile.h
 
 # Blow away kernel.o because build info is stored statically within it.
 delete-unfresh-files:
-	rm -f include/xen/compile.h common/kernel.o
+	rm -f include/xen/banner.h include/xen/compile.h common/kernel.o
 
 # compile.h contains dynamic build info. Rebuilt on every 'make' invocation.
 include/xen/compile.h: LANG=C
 include/xen/compile.h: include/xen/compile.h.in include/xen/banner.h
-	sed -e 's/@@date@@/$(shell date)/g' \
+	@sed -e 's/@@date@@/$(shell date)/g' \
 	    -e 's/@@time@@/$(shell date +%T)/g' \
 	    -e 's/@@whoami@@/$(shell whoami)/g' \
 	    -e 's/@@domain@@/$(shell ([ -x /bin/dnsdomainname ] && /bin/dnsdomainname) || ([ -x /bin/domainname ] && /bin/domainname || echo [unknown]))/g' \
@@ -67,8 +67,8 @@ include/xen/compile.h: include/xen/compile.h.in include/xen/banner.h
 	    -e 's/@@extraversion@@/$(XEN_EXTRAVERSION)/g' \
 	    -e 's!@@changeset@@!$(shell bk changes -nd':D: :T: :REV: :MD5KEY:' -r+ 2>/dev/null || echo information unavailable)!g' \
 	    < include/xen/compile.h.in > $@.new
-	cat include/xen/banner.h >> $@.new
-	mv -f $@.new $@
+	@cat include/xen/banner.h >> $@.new
+	@mv -f $@.new $@
 
 tools/figlet/figlet: tools/figlet/figlet.o
 	$(CC) -o $@ $<
@@ -77,7 +77,7 @@ tools/figlet/figlet.o: tools/figlet/figlet.c
 
 include/xen/banner.h: tools/figlet/figlet tools/figlet/xen.flf
 	tools/figlet/figlet -d tools/figlet Xen $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) > $@.new
-	mv -f $@.new $@
+	@mv -f $@.new $@
 
 include/asm-$(TARGET_ARCH)/asm-offsets.h: arch/$(TARGET_ARCH)/asm-offsets.s
 	@(set -e; \

xen/include/xen/banner.h

@@ -1,12 +0,0 @@
-"\040\137\137\040\040\137\137\040\040\040\040\040\040\040\040\040\040\040" \
-"\040\137\137\137\137\040\040\040\040\137\137\137\040\040\012\040\134\040" \
-"\134\057\040\057\137\137\137\040\137\040\137\137\040\040\040\174\137\137" \
-"\137\040\134\040\040\057\040\137\040\134\040\012\040\040\134\040\040\057" \
-"\057\040\137\040\134\040\047\137\040\134\040\040\040\040\137\137\051\040" \
-"\174\174\040\174\040\174\040\174\012\040\040\057\040\040\134\040\040\137" \
-"\137\057\040\174\040\174\040\174\040\040\057\040\137\137\057\040\174\040" \
-"\174\137\174\040\174\012\040\057\137\057\134\137\134\137\137\137\174\137" \
-"\174\040\174\137\174\040\174\137\137\137\137\137\050\137\051\137\137\137" \
-"\057\040\012\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040" \
-"\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\012" \
-