aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeir Fraser <keir@xen.org>2011-02-16 18:23:07 +0000
committerKeir Fraser <keir@xen.org>2011-02-16 18:23:07 +0000
commit317f9f334f2826380d0cf32a2801a62ff72c99f3 (patch)
tree310eb78a154912335495e02bc2175342f573076d
parent436de2833f7a5133214cfa0651d4fcc6d273ce50 (diff)
downloadxen-4.1.0-rc5.tar.gz
xen-4.1.0-rc5.tar.bz2
xen-4.1.0-rc5.zip
Update Xen version to 4.1.0-rc54.1.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 694b60dd42..bf7765e8f4 100644
--- a/Config.mk
+++ b/Config.mk
@@ -185,7 +185,8 @@ endif
# CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git
CONFIG_QEMU ?= $(QEMU_REMOTE)
-QEMU_TAG ?= e073e69457b4d99b6da0b6536296e3498f7f6599
+QEMU_TAG := xen-4.1.0-rc5
+#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 8052521cac..41ff1921ac 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-rc5-pre$(XEN_VENDORVERSION)
+export XEN_EXTRAVERSION ?= .0-rc5$(XEN_VENDORVERSION)
export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)
-include xen-version