Update Xen version to 4.0.2-rc1

diff --git a/Config.mk b/Config.mk
index bd2daaceecf301b4a57b984879220c9bb55a0f3a..21b415fa1b0096ed2dfa7204bfa23beeb88b89a4 100644 (file)
--- a/Config.mk
+++ b/Config.mk
@@ -167,7 +167,8 @@ endif
 # CONFIG_QEMU ?= ../qemu-xen.git
 CONFIG_QEMU ?= $(QEMU_REMOTE)
 
-QEMU_TAG ?= 6d5b7ee3acfe8cc10681d2583a38398f7470ec2a
+QEMU_TAG := xen-4.0.2-rc1
+#QEMU_TAG ?= 6d5b7ee3acfe8cc10681d2583a38398f7470ec2a
 # Wed Jan 5 23:42:03 2011 +0000
 # Change tap device mac address to prevent change of bridge's mac
 

diff --git a/xen/Makefile b/xen/Makefile
index ca6844549c167f7921f7e8920117535b5ac3e7bf..595d55ddb6045830b7a64abdf2ed2b74b46bce26 100644 (file)
--- 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 ?= .2-rc1-pre$(XEN_VENDORVERSION)
+export XEN_EXTRAVERSION ?= .2-rc1$(XEN_VENDORVERSION)
 export XEN_FULLVERSION   = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)
 -include xen-version