aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeir Fraser <keir@xen.org>2012-05-07 13:45:31 +0100
committerKeir Fraser <keir@xen.org>2012-05-07 13:45:31 +0100
commit224775a2dc8a7005f3fe793f6f8294bda675a5be (patch)
treeb3a41f682d52e0855237e234bf71de2e9287778d
parent506243e7644fb32bf7bfd7238d3c64be0ad14b91 (diff)
downloadxen-224775a2dc8a7005f3fe793f6f8294bda675a5be.tar.gz
xen-224775a2dc8a7005f3fe793f6f8294bda675a5be.tar.bz2
xen-224775a2dc8a7005f3fe793f6f8294bda675a5be.zip
Update Xen version to 4.0.4-rc14.0.4-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 a037116293..01965b056f 100644
--- a/Config.mk
+++ b/Config.mk
@@ -178,7 +178,7 @@ endif
# CONFIG_QEMU ?= ../qemu-xen.git
CONFIG_QEMU ?= $(QEMU_REMOTE)
-QEMU_TAG := 36984c285a765541b04f378bfa84d2c850c167d3
+QEMU_TAG := xen-4.0.4-rc1
# Thu Feb 2 13:47:06 2012 +0000
# e1000: bounds packet size against buffer size
diff --git a/xen/Makefile b/xen/Makefile
index e39d997946..beb612cd2e 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-rc1-pre$(XEN_VENDORVERSION)
+export XEN_EXTRAVERSION ?= .4-rc1$(XEN_VENDORVERSION)
export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)
-include xen-version