aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeir Fraser <keir@xen.org>2012-06-18 15:11:33 +0100
committerKeir Fraser <keir@xen.org>2012-06-18 15:11:33 +0100
commit79daabc482172618d3dcd225432a8b556c57a197 (patch)
tree4af3dbe3787dc07702a255112d4500385c38be5e
parent718c81ab4194340af12c1592c09149454f027ce9 (diff)
downloadxen-79daabc482172618d3dcd225432a8b556c57a197.tar.gz
xen-79daabc482172618d3dcd225432a8b556c57a197.tar.bz2
xen-79daabc482172618d3dcd225432a8b556c57a197.zip
Update Xen version to 4.0.4-rc24.0.4-rc2
-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 01965b056f..2473f4d24e 100644
--- a/Config.mk
+++ b/Config.mk
@@ -178,7 +178,7 @@ endif
# CONFIG_QEMU ?= ../qemu-xen.git
CONFIG_QEMU ?= $(QEMU_REMOTE)
-QEMU_TAG := xen-4.0.4-rc1
+QEMU_TAG := xen-4.0.4-rc2
# Thu Feb 2 13:47:06 2012 +0000
# e1000: bounds packet size against buffer size
diff --git a/xen/Makefile b/xen/Makefile
index 58f6232e0e..b2d50eb359 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 = 0
-export XEN_EXTRAVERSION ?= .4-rc2-pre$(XEN_VENDORVERSION)
+export XEN_EXTRAVERSION ?= .4-rc2$(XEN_VENDORVERSION)
export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)
-include xen-version