aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeir Fraser <keir@xen.org>2011-01-25 14:06:52 +0000
committerKeir Fraser <keir@xen.org>2011-01-25 14:06:52 +0000
commit394a695e0ee3a3b7bcefa640acf76736e067b19b (patch)
tree97ee18efbf3a3c4d09ec157dcce4b7c768020d1d
parent6a1ea5dd5dfdbc97b2da1fefbf1fb1c609681126 (diff)
downloadxen-4.1.0-rc2.tar.gz
xen-4.1.0-rc2.tar.bz2
xen-4.1.0-rc2.zip
Update Xen version to 4.1.0-rc24.1.0-rc2
-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 42d39f15ce..20a4dac40f 100644
--- a/Config.mk
+++ b/Config.mk
@@ -185,7 +185,8 @@ endif
# CONFIG_QEMU ?= $(XEN_ROOT)/../qemu-xen.git
CONFIG_QEMU ?= $(QEMU_REMOTE)
-QEMU_TAG ?= 6a6ffc07f465d5abc94b45ce6fe389369d1395ab
+QEMU_TAG := xen-4.1.0-rc2
+#QEMU_TAG ?= 6a6ffc07f465d5abc94b45ce6fe389369d1395ab
# Fri Jan 21 18:01:53 2011 +0000
# qemu-xen: disable buffering on the save file for stubdoms
diff --git a/xen/Makefile b/xen/Makefile
index adbfe37f1a..34af341e38 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-rc2-pre$(XEN_VENDORVERSION)
+export XEN_EXTRAVERSION ?= .0-rc2$(XEN_VENDORVERSION)
export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)
-include xen-version