aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeir Fraser <keir@xen.org>2011-08-25 11:38:17 +0100
committerKeir Fraser <keir@xen.org>2011-08-25 11:38:17 +0100
commit1e17202af327ba535fce7b5b6ff7e050ba7b4628 (patch)
tree6b91e148f535fe33058cea3b474515b99b122c14
parenta2776e5ecf6371cd9b980f9e5ac5a56fba7a635a (diff)
downloadxen-4.1.2-rc1.tar.gz
xen-4.1.2-rc1.tar.bz2
xen-4.1.2-rc1.zip
Update Xen version to 4.1.2-rc14.1.2-rc1
-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 67a377da82..07ce7b3fde 100644
--- a/Config.mk
+++ b/Config.mk
@@ -196,7 +196,7 @@ endif
# CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git
CONFIG_QEMU ?= $(QEMU_REMOTE)
-QEMU_TAG := xen-4.1.1
+QEMU_TAG := xen-4.1.2-rc1
#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 d81353f2b4..572cfc8f5c 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 ?= .2-rc1-pre$(XEN_VENDORVERSION)
+export XEN_EXTRAVERSION ?= .2-rc1$(XEN_VENDORVERSION)
export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)
-include xen-version