aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkaf24@freefall.cl.cam.ac.uk <kaf24@freefall.cl.cam.ac.uk>2004-11-04 11:27:56 +0000
committerkaf24@freefall.cl.cam.ac.uk <kaf24@freefall.cl.cam.ac.uk>2004-11-04 11:27:56 +0000
commit8200029b4b0599c3c505df77f808371c3b6d6a61 (patch)
tree1c5e8ba81097521fa1fe5aafa7caa0887da2834f
parent6f0e7f057aa8ce5ad940a759f7be814b20bb7779 (diff)
parent2d18d47e0d9e75ae024639ae0279940ca77ee02a (diff)
downloadxen-8200029b4b0599c3c505df77f808371c3b6d6a61.tar.gz
xen-8200029b4b0599c3c505df77f808371c3b6d6a61.tar.bz2
xen-8200029b4b0599c3c505df77f808371c3b6d6a61.zip
bitkeeper revision 1.1159.1.368 (418a123cIsAPDbiOvFxfHLZQhSRPbQ)
Merge freefall.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk into freefall.cl.cam.ac.uk:/local/scratch/kaf24/xeno
-rw-r--r--xen/Makefile2
-rw-r--r--xen/common/kernel.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/xen/Makefile b/xen/Makefile
index 209c7adc1e..6f0e1ff561 100644
--- a/xen/Makefile
+++ b/xen/Makefile
@@ -61,6 +61,8 @@ include/xen/compile.h:
@LANG=C echo \#define XEN_SUBVERSION\ \ \ $(XEN_SUBVERSION) >> $@
@LANG=C echo \#define XEN_EXTRAVERSION \"$(XEN_EXTRAVERSION)\" >> $@
@LANG=C echo >> $@
+ @LANG=C echo \#define XEN_CHANGESET \"`bk changes -nd':D: :T: :REV: :MD5KEY:' -r+ 2>/dev/null || echo "information unavailable"`\" >> $@
+ @LANG=C echo >> $@
@LANG=C echo \#define XEN_BANNER \\ >> $@
cd ./figlet && make && ./figlet Xen $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) 1>>../$@ && cd ..
@LANG=C echo >> $@
diff --git a/xen/common/kernel.c b/xen/common/kernel.c
index 9687f8c020..29e2488875 100644
--- a/xen/common/kernel.c
+++ b/xen/common/kernel.c
@@ -195,10 +195,11 @@ void cmain(multiboot_info_t *mbi)
printk(XEN_BANNER);
printk(" http://www.cl.cam.ac.uk/netos/xen\n");
printk(" University of Cambridge Computer Laboratory\n\n");
- printk(" Xen version %d.%d%s (%s@%s) (%s) %s\n\n",
+ printk(" Xen version %d.%d%s (%s@%s) (%s) %s\n",
XEN_VERSION, XEN_SUBVERSION, XEN_EXTRAVERSION,
XEN_COMPILE_BY, XEN_COMPILE_DOMAIN,
XEN_COMPILER, XEN_COMPILE_DATE);
+ printk(" Latest ChangeSet: %s\n\n", XEN_CHANGESET);
set_printk_prefix("(XEN) ");
/* We require memory and module information. */