aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeir Fraser <keir@xen.org>2011-10-20 17:35:24 +0100
committerKeir Fraser <keir@xen.org>2011-10-20 17:35:24 +0100
commiteba9045a7dc8c358a15653604d1a7cb2dbc8a239 (patch)
tree1e6e5e9767acc9dc3305c81b46b008dd9f2503a0
parenta45061a9dafd4c096b49ffc14f8498d1f7449592 (diff)
downloadxen-eba9045a7dc8c358a15653604d1a7cb2dbc8a239.tar.gz
xen-eba9045a7dc8c358a15653604d1a7cb2dbc8a239.tar.bz2
xen-eba9045a7dc8c358a15653604d1a7cb2dbc8a239.zip
Update Xen version to 4.1.2RELEASE-4.1.2
-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 ffc52064a3..46391aa37f 100644
--- a/Config.mk
+++ b/Config.mk
@@ -179,7 +179,7 @@ endif
# CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git
CONFIG_QEMU ?= $(QEMU_REMOTE)
-QEMU_TAG := xen-4.1.2-rc3
+QEMU_TAG := xen-4.1.2
#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 08231b0512..79e9eabba7 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-rc3$(XEN_VENDORVERSION)
+export XEN_EXTRAVERSION ?= .2$(XEN_VENDORVERSION)
export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)
-include xen-version