aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeir Fraser <keir@xen.org>2011-02-28 16:54:15 +0000
committerKeir Fraser <keir@xen.org>2011-02-28 16:54:15 +0000
commit4a649c84f568554bf7d41ee6b1ea9d0092113bf3 (patch)
tree2f82bef3fce00f0e0e6328da49ffb79d4dbca4f4
parent2e13a886e5a82621bd916479ed192ed59eb05e72 (diff)
downloadxen-4.1.0-rc6.tar.gz
xen-4.1.0-rc6.tar.bz2
xen-4.1.0-rc6.zip
Update Xen version to 4.1.0-rc64.1.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 bf7765e8f4..753d3327c3 100644
--- a/Config.mk
+++ b/Config.mk
@@ -185,7 +185,7 @@ endif
# CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git
CONFIG_QEMU ?= $(QEMU_REMOTE)
-QEMU_TAG := xen-4.1.0-rc5
+QEMU_TAG := xen-4.1.0-rc6
#QEMU_TAG ?= e073e69457b4d99b6da0b6536296e3498f7f6599
# Fri Feb 11 17:54:51 2011 +0000
# qemu-xen: fix segfault with empty cdroms
diff --git a/xen/Makefile b/xen/Makefile
index 74b08c983b..3b00ee54cc 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 = 1
-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