aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeir Fraser <keir.fraser@citrix.com>2010-03-01 16:50:26 +0000
committerKeir Fraser <keir.fraser@citrix.com>2010-03-01 16:50:26 +0000
commit4aee22650cbbe8b76dd690f7c9cea763e671a680 (patch)
treec7df426631f941f1bc0398ca5f6dc8e738836064
parentda1a6632f5de3f9c711052882f2a918d0c2bdb47 (diff)
downloadxen-4aee22650cbbe8b76dd690f7c9cea763e671a680.tar.gz
xen-4aee22650cbbe8b76dd690f7c9cea763e671a680.tar.bz2
xen-4aee22650cbbe8b76dd690f7c9cea763e671a680.zip
Update Xen version to 4.0.0-rc54.0.0-rc5
-rw-r--r--Config.mk3
-rw-r--r--xen/Makefile2
2 files changed, 3 insertions, 2 deletions
diff --git a/Config.mk b/Config.mk
index ad86e1e132..cd27af756d 100644
--- a/Config.mk
+++ b/Config.mk
@@ -150,7 +150,8 @@ QEMU_REMOTE=http://xenbits.xensource.com/git-http/qemu-xen-unstable.git
# CONFIG_QEMU ?= ../qemu-xen.git
CONFIG_QEMU ?= $(QEMU_REMOTE)
-QEMU_TAG ?= e5d14857cd67490bf956d97c8888c0be95ed3f78
+QEMU_TAG := xen-4.0.0-rc5
+#QEMU_TAG ?= e5d14857cd67490bf956d97c8888c0be95ed3f78
# Thu Feb 18 15:36:29 2010 +0000
# When xen_platform_pci=0 also disable fixed Xen platform ioports
diff --git a/xen/Makefile b/xen/Makefile
index 5aa4f195e1..552a875889 100644
--- a/xen/Makefile
+++ b/xen/Makefile
@@ -2,7 +2,7 @@
# All other places this is stored (eg. compile.h) should be autogenerated.
export XEN_VERSION = 4
export XEN_SUBVERSION = 0
-export XEN_EXTRAVERSION ?= .0-rc4$(XEN_VENDORVERSION)
+export XEN_EXTRAVERSION ?= .0-rc5$(XEN_VENDORVERSION)
export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)
-include xen-version