aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeir Fraser <keir.fraser@citrix.com>2010-03-09 18:18:05 +0000
committerKeir Fraser <keir.fraser@citrix.com>2010-03-09 18:18:05 +0000
commit19db7b01e2962dc8a95beab0831ddc288bbce7f6 (patch)
tree1e625d2d386f3ac4ecccc963ff708c0f1941eba9
parent17795caf52a78c773e7ba5b914bb0579766f146a (diff)
downloadxen-19db7b01e2962dc8a95beab0831ddc288bbce7f6.tar.gz
xen-19db7b01e2962dc8a95beab0831ddc288bbce7f6.tar.bz2
xen-19db7b01e2962dc8a95beab0831ddc288bbce7f6.zip
Update Xen version to 4.0.0-rc64.0.0-rc6
-rw-r--r--Config.mk2
-rw-r--r--xen/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/Config.mk b/Config.mk
index a0dc40e272..cae39ed8cd 100644
--- a/Config.mk
+++ b/Config.mk
@@ -153,7 +153,7 @@ QEMU_REMOTE=http://xenbits.xensource.com/git-http/qemu-xen-unstable.git
# CONFIG_QEMU ?= ../qemu-xen.git
CONFIG_QEMU ?= $(QEMU_REMOTE)
-QEMU_TAG := xen-4.0.0-rc5
+QEMU_TAG := xen-4.0.0-rc6
#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 c54d6917fb..2af4a92aae 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-rc6-pre$(XEN_VENDORVERSION)
+export XEN_EXTRAVERSION ?= .0-rc6$(XEN_VENDORVERSION)
export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)
-include xen-version